diff options
195 files changed, 1768 insertions, 2172 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index f7af85e5d9..c67c6e9601 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,240 @@ +Sat Apr 17 04:48:35 UTC 2021 +academic/cblas: Updated for version 3.9.1. +academic/lapacke: Updated for version 3.9.1. +academic/octave: Updated for version 6.2.0. +academic/pari: Updated for version 2.13.1. +academic/sundials: Fix download link. +audio/mixxx: Use protobuf3 as a dependency. +audio/nas: Force single make job. +desktop/dmenu2: Removed (unmaintained upstream). +desktop/lxpanel: Updated for version 0.10.1. +desktop/screenkey: Updated for version 1.4. +desktop/xss-lock: Added (using external locker as X screensaver) +development/Sphinx: Updated for version 3.5.4. +development/eovim: Updated for version 0.2.0. +development/google-go-lang: Updated for version 1.16.3. +development/jupyter-ipykernel: Updated for version 5.5.3. +development/lepton-eda: Updated for version 1.9.14. +development/nim: Updated for version 1.4.6. +development/nodejs: Fix tarball extension. +development/postman: Updated for version 8.2.1 +development/tea: updated for version 60.0.3 +games/armagetronad: Updated for version 0.2.9.1.0. +gis/osm2pgsql: Updated for version 1.4.2. +gis/rasterio: Updated for version 1.2.2. +graphics/lilypond: Updated for version 2.22.0. +graphics/vuescan: Updated MD5SUMs. +libraries/blas: Updated for version 3.9.1. +libraries/iddawc: Compress man pages. +libraries/iddawc: updated for version 0.9.9 +libraries/lapack: Updated for version 3.9.1. +libraries/libfm-extra: Updated for version 1.3.2. +libraries/libfm: Updated for version 1.3.2. +libraries/libxkbcommon: Updated for version 1.2.1. +libraries/libxlsxwriter: Updated for version 1.0.2. +libraries/rhonabwy: updated for version 0.9.999 +libraries/skalibs: Updated for version 2.10.0.3. +libraries/xblas: Use a versioned tarball. +multimedia/gnash: Updated for version 0.8.11dev_20190130. +multimedia/plexmediaserver: Updated for v 1.22.2.4282_a97b03fad. +network/basilisk-bin: Updated for version 2021.03.17. +network/brave-browser: Updated for version 1.23.71. +network/hostapd: Patched for P2P/wpa_supplicant vulnerabilities. +network/keepalived: Updated for version 2.2.2. +network/nweb: Added (tiny web server in C). +network/palemoon-bin: Updated for version 29.1.1. +network/palemoon: Updated for version 29.1.1. +network/qutebrowser-tox: Updated for version 2.2.0. +network/qutebrowser: Updated for version 2.2.0. +network/signal-desktop: Updated for version 5.0.0. +network/spamassassin: Updated for version 3.4.6. +network/unbound: Updated for version 1.13.1. +office/calcurse: Updated for version 4.7.1. +office/calibre-bin: Updated for version 5.15.0. +perl/perl-Math-GMPz: Updated for version 0.50. +perl/perl-Sidef: Updated for version 3.98. +python/decorator: Updated for version 5.0.6. +python/decorator: Updated for version 5.0.7. +python/internetarchive: Updated for version 2.0.1. +python/python-neovim: Updated for version 0.4.3. +python/python-prometheus_client: Updated for version 0.10.1. +python/python3-aiohttp: Updated for version 3.7.4.post0. +python/python3-astroid: Updated for version 2.5.3. +python/python3-ptyprocess: Updated for version 0.7.0. +python/python3-seaborn: Updated for version 0.11.1. +python/scikit-learn: Updated for version 0.24.1. +python/typed_ast: Updated for version 1.4.3. +system/android-file-transfer: Updated for version 4.2. +system/ansible: Updated for version 2.9.20. +system/clamav: Fix permissions to allow users to run clamscan. +system/execline: Updated for version 2.8.0.1. +system/lxtask: Updated for version 0.1.10. +system/lxterminal: Updated for version 0.4.0. +system/netdata: Updated for version 1.29.3. +system/newLd: Update script. +system/pax: Updated for version 20201030 (switch to MirBSD pax). +system/pcmanfm: Updated for version 1.3.2. +system/qdirstat: Updated for version 1.7.1. +system/s6-linux-init: Updated for version 1.0.6.2. +system/s6-rc: Updated for version 0.5.2.2. +system/s6: Updated for version 2.10.0.3. +system/telegraf: Updated for version 1.18.1. +system/wine-staging: Updated for version 6.5. ++--------------------------+ +Sat Apr 10 10:06:04 UTC 2021 +academic/Gridcoin-Research: Updated for version 5.3.1.0 +academic/boinc: Updated for version 7.16.16 +academic/sword-data-kjv: Updated for version 1.8.1_1. +academic/wxMaxima: Updated for version 21.01.0. +audio/ardour: Updated for version 6.6. +audio/ncmpcpp: Update maintainer email. +audio/vimpc: Update maintainer email. +development/QtPy: Added (Qt abstraction layer for Python) +development/apache-maven: Updated for version 3.8.1. +development/dotnet-runtime: Updated for version 3.1.13. +development/dotnet-sdk: Updated for version 3.1.407. +development/ghi: Update maintainer email. +development/github-cli: Updated for version 1.8.1 +development/jupyter-ipykernel: Updated for version 5.3.4. +development/jupyter-ipywidgets: Updated for version 7.6.3. +development/jupyter-nbclient: Added (execution contexts). +development/jupyter-nbconvert: Updated for version 6.0.7. +development/jupyter-nbformat: Updated for version 5.1.3. +development/jupyter-notebook: Updated for version 6.3.0. +development/jupyter-qtconsole: Update dependencies. +development/jupyter-qtconsole: Updated for version 5.0.1. +development/jupyter_client: Remove Python 2 support. +development/jupyter_client: Updated for version 6.1.13. +development/jupyter_console: Change dependencies. +development/jupyter_console: Updated for version 6.4.0. +development/jupyter_core: Remove Python 2 support. +development/jupyterlab_pygments: Added (theme for Pygments). +development/mongodb-compass: Updated for version 1.26.1. +development/neovim: Update homepage. +development/nim: Updated for version 1.4.4. +development/nodejs-bin: Updated for version 14.16.1. +development/nodejs: Updated for version 12.22.1. +development/racer: Updated for version 2.1.45. +development/robotframework: Updated for version 4.0.1. +development/sbcl: Updated for version 2.1.3. +development/sdcc: Updated for version 4.1.0. +development/slibtool: Updated for version 0.5.33. +development/xkeys-sdk: Added (SDK for X-Keys) +games/VASSAL: Updated for version 3.5.5. +games/crispy-doom: Updated for version 5.10.1. +games/freeciv: wrong md5sum +games/steam: Updated for version 1.0.0.69 +gis/Fiona: Updated for version 1.8.19. +gis/geopandas: Updated for version 0.9.0. +gis/osm2pgsql: Updated for version 1.4.1. +gis/pgsql-ogr-fdw: Updated for version 1.1.0. +gis/qgis: Support PROJ 8. +gis/spatialite_gui: Add a fix for the newer proj. +graphics/mtpaint: Updated for version 3.50. +graphics/vuescan: Updated for version 9.7.52. +ibraries/lua-luv: Updated for version 1.36.0_0. +libraries/Jinja2: Updated for version 2.11.3. +libraries/aspnetcore-runtime: Updated for version 3.1.13. +libraries/libcpuid: Updated for version 0.5.1. +libraries/libfastjson: Updated for version 0.99.9. +libraries/libprelude: Added (Prelude SIEM/sensor library) +libraries/librelp: Updated for version 1.10.0. +libraries/libvterm: Updated for version 0.1.4. +libraries/libxkbcommon: Updated for version 1.2.0. +libraries/libxnvctrl: Updated for version 460.67. +libraries/luasec: Updated for version 1.0. +libraries/opencv: Updated for version 4.5.2 +libraries/tox-extension-messages: Added (extension library for tox). +libraries/toxext: Added (extension library for tox). +libraries/unibilium: Updated for version 2.1.1. +misc/mosquitto: Updated for version 2.0.10 +multimedia/LBRY: Updated for version 0.50.2. +multimedia/droidcam: Added (Chat Program). +multimedia/plexmediaserver: Updated for v 1.22.1.4275_48e10484b. +multimedia/pyradio: Update maintainer email. +multimedia/srt-to-vtt-cl: Added (convert srt files to webtvv) +network/Electrum: Updated for version 4.1.1. +network/anydesk: Updated for version 6.1.0. +network/brave-browser: Updated for version 1.22.71. +network/emailrelay: Updated for version 2.2. +network/libteam: Added (Library for controlling networking). +network/mumble: Updated for version 1.3.4 +network/murmur: Updated for version 1.3.4 +network/newsboat: Updated for version 2.23. +network/openfortivpn: Updated for version 1.16.0. +network/privoxy: Updated for version 3.0.32. +network/prosody: Updated for version 0.11.8. +network/protonmail-bridge: Fix download URL. +network/qutebrowser-tox: Update pdfjs. +network/signal-desktop: Updated for version 1.40.1. +network/spamassassin: Updated for version 3.4.5. +network/speedtest-cli: Updated for version 2.1.3. +network/sslscan: Updated for version 2.0.9. +network/teams: Added missing doinst.sh file. +network/verm: Updated for version 1.5.2. +network/wendzelnntpd: Added (Easy-to-use NNTP Server). +office/MasterPDFEditor: Updated for version 5.7.53. +office/ghostwriter: Fix for -current. +office/mairix: Update maintainer email. +office/mu: Update maintainer email. +office/notmuch: Update maintainer email. +office/nts: Update maintainer email. +office/sc-im: Update maintainer email. +office/taskjuggler: Update maintainer email. +office/teapot: Update maintainer email. +office/tnote: Update maintainer email. +office/tpp: Update maintainer email. +office/tudu: Update maintainer email. +office/watson: Update maintainer email. +python/Pygments: Updated for version 2.8.1. +python/apprise: Added (Multiplatform Push Notifications) +python/async_generator: Added (async iterators). +python/backcall: Updated for version 0.2.0. +python/bleach: Updated for version 3.3.0. +python/decorator: Updated for version 5.0.5. +python/nest_asyncio: Added (nested async event loops). +python/parso: Updated for version 0.8.2. +python/python-PySnooper: Updated for version 0.4.3. +python/python-emoji: Updated for version 1.2.0. +python/python-neovim: Update homepage. +python/python-prometheus_client: Updated for version 0.10.0. +python/python3-aiorpcX-legacy: Added (async RPC implementation) +python/python3-jupyter-ipykernel: Removed (use jupyter-ipykernel). +python/python3-packaging: Updated for version 20.9. +python/python3-prompt_toolkit: Updated for version 3.0.18. +python/python3-pylint: Updated for version 2.7.4. +python/python3-stagger: Fix URL. +python/sphinxcontrib-applehelp: Updated for version 1.0.2. +python/sphinxcontrib-htmlhelp: Updated for version 1.0.3. +ruby/chronic: Update maintainer email. +ruby/ncurses-ruby: Update maintainer email. +ruby/ruby-build: Updated for version 20210405. +ruby/rubygem-mail: Update maintainer email. +ruby/rubygem-mime-types-data: Update maintainer email. +ruby/rubygem-mime-types: Update maintainer email. +ruby/rubygem-mini_mime: Update maintainer email. +ruby/rubygem-multi_json: Update maintainer email. +ruby/rubygem-pygments: Update maintainer email. +ruby/rubygem-sync: Update maintainer email. +ruby/rubygem-term-ansicolor: Update maintainer email. +ruby/rubygem-tins: Update maintainer email. +ruby/sequel4: Update maintainer email. +ruby/sqlite3: Update maintainer email. +system/CPU-X: Updated for version 4.2.0. +system/atop: Fix build. +system/avfs: Updated for version 1.1.4. +system/clamav: Updated for version 0.103.2. +system/exa: Updated for version 0.10.0. +system/fzf: Updated for version 0.27.0. +system/intelmas: Updated for version 1.7. +system/jenkins: Updated for version 2.277.2. +system/letsencrypt: Updated for version 1.14.0. +system/porg: Update maintainer email. +system/powershell: Updated for version 7.1.3. +system/rsyslog: Updated for version 8.2102.0. +system/skim: Updated for version 0.9.4. +system/worker: Updated for version 4.8.0. ++--------------------------+ Sat Apr 3 01:49:17 UTC 2021 academic/ds9: Updated for version 8.2.1. academic/rpy2: Updated for version 3.4.3. diff --git a/academic/cblas/cblas.SlackBuild b/academic/cblas/cblas.SlackBuild index a7cadea464..3a18cc1daa 100644 --- a/academic/cblas/cblas.SlackBuild +++ b/academic/cblas/cblas.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for CBLAS -# Copyright 2016-2020 Kyle Guinn <elyk03@gmail.com> +# Copyright 2016-2021 Kyle Guinn <elyk03@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=cblas SRCNAM=lapack -VERSION=${VERSION:-3.9.0} +VERSION=${VERSION:-3.9.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/academic/cblas/cblas.info b/academic/cblas/cblas.info index 06128f1f4e..7821e1a648 100644 --- a/academic/cblas/cblas.info +++ b/academic/cblas/cblas.info @@ -1,8 +1,8 @@ PRGNAM="cblas" -VERSION="3.9.0" +VERSION="3.9.1" HOMEPAGE="https://www.netlib.org/blas/" -DOWNLOAD="https://github.com/Reference-LAPACK/lapack/archive/v3.9.0/lapack-3.9.0.tar.gz" -MD5SUM="0b251e2a8d5f949f99b50dd5e2200ee2" +DOWNLOAD="https://github.com/Reference-LAPACK/lapack/archive/v3.9.1/lapack-3.9.1.tar.gz" +MD5SUM="47ab2d11652045145df37ddbe2a32d71" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="blas" diff --git a/academic/cblas/patches/cmake-piecewise.diff b/academic/cblas/patches/cmake-piecewise.diff index b1bdfaec1e..378acc8769 100644 --- a/academic/cblas/patches/cmake-piecewise.diff +++ b/academic/cblas/patches/cmake-piecewise.diff @@ -5,25 +5,25 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt message(STATUS "CBLAS enable") enable_language(C) --set(LAPACK_INSTALL_EXPORT_NAME cblas-targets) +-set(LAPACK_INSTALL_EXPORT_NAME ${CBLASLIB}-targets) - # Create a header file cblas.h for the routines called in my C programs include(FortranCInterface) ## Ensure that the fortran compiler and c compiler specified are compatible -@@ -41,54 +39,8 @@ +@@ -45,54 +43,8 @@ add_subdirectory(examples) endif() -if(NOT BLAS_FOUND) -- set(ALL_TARGETS ${ALL_TARGETS} blas) +- set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB}) -endif() - -# Export cblas targets from the -# install tree, if any. -set(_cblas_config_install_guard_target "") -if(ALL_TARGETS) -- install(EXPORT cblas-targets -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION} +- install(EXPORT ${CBLASLIB}-targets +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION} - COMPONENT Development - ) - # Choose one of the cblas targets to use as a guard for @@ -34,7 +34,7 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt -# Export cblas targets from the build tree, if any. -set(_cblas_config_build_guard_target "") -if(ALL_TARGETS) -- export(TARGETS ${ALL_TARGETS} FILE cblas-targets.cmake) +- export(TARGETS ${ALL_TARGETS} FILE ${CBLASLIB}-targets.cmake) - - # Choose one of the cblas targets to use as a guard - # for cblas-config.cmake to load targets from the build tree. @@ -42,27 +42,27 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt -endif() - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-version.cmake.in -- ${LAPACK_BINARY_DIR}/cblas-config-version.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${CBLASLIB}-config-version.cmake @ONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-build.cmake.in -- ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${CBLASLIB}-config.cmake @ONLY) - - - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}.pc @ONLY) install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc + ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}.pc DESTINATION ${PKG_CONFIG_DIR} ) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-install.cmake.in -- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake @ONLY) +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CBLASLIB}-config.cmake @ONLY) -install(FILES -- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake -- ${LAPACK_BINARY_DIR}/cblas-config-version.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION} +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CBLASLIB}-config.cmake +- ${LAPACK_BINARY_DIR}/${CBLASLIB}-config-version.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION} - ) - --#install(EXPORT cblas-targets --# DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION} +-#install(EXPORT ${CBLASLIB}-targets +-# DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION} -# COMPONENT Development -# ) diff --git a/CBLAS/cmake/cblas-config-build.cmake.in b/CBLAS/cmake/cblas-config-build.cmake.in @@ -76,14 +76,14 @@ deleted file mode 100644 - -# Load lapack targets from the build tree, including lapacke targets. -if(NOT TARGET lapacke) -- include("@LAPACK_BINARY_DIR@/lapack-targets.cmake") +- include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake") -endif() - -# Report cblas header search locations from build tree. -set(CBLAS_INCLUDE_DIRS "@LAPACK_BINARY_DIR@/include") - -# Report cblas libraries. --set(CBLAS_LIBRARIES cblas) +-set(CBLAS_LIBRARIES @CBLASLIB@) diff --git a/CBLAS/cmake/cblas-config-install.cmake.in b/CBLAS/cmake/cblas-config-install.cmake.in deleted file mode 100644 --- a/CBLAS/cmake/cblas-config-install.cmake.in @@ -96,19 +96,19 @@ deleted file mode 100644 -get_filename_component(_CBLAS_PREFIX "${_CBLAS_PREFIX}" PATH) - -# Load the LAPACK package with which we were built. --set(LAPACK_DIR "${_CBLAS_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/lapack-@LAPACK_VERSION@") +-set(LAPACK_DIR "${_CBLAS_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/@LAPACKLIB@-@LAPACK_VERSION@") -find_package(LAPACK NO_MODULE) - -# Load lapacke targets from the install tree. --if(NOT TARGET cblas) -- include(${_CBLAS_SELF_DIR}/cblas-targets.cmake) +-if(NOT TARGET @CBLASLIB@) +- include(${_CBLAS_SELF_DIR}/@CBLASLIB@-targets.cmake) -endif() - -# Report lapacke header search locations. -set(CBLAS_INCLUDE_DIRS ${_CBLAS_PREFIX}/include) - -# Report lapacke libraries. --set(CBLAS_LIBRARIES cblas) +-set(CBLAS_LIBRARIES @CBLASLIB@) - -unset(_CBLAS_PREFIX) -unset(_CBLAS_SELF_DIR) @@ -128,16 +128,16 @@ deleted file mode 100644 diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt --- a/CBLAS/src/CMakeLists.txt +++ b/CBLAS/src/CMakeLists.txt -@@ -120,9 +120,5 @@ - VERSION ${LAPACK_VERSION} - SOVERSION ${LAPACK_MAJOR_VERSION} - ) --target_include_directories(cblas PUBLIC +@@ -123,9 +123,5 @@ + if(HAS_ATTRIBUTE_WEAK_SUPPORT) + target_compile_definitions(${CBLASLIB} PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT) + endif() +-target_include_directories(${CBLASLIB} PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> - $<INSTALL_INTERFACE:include> -) - target_link_libraries(cblas PRIVATE ${BLAS_LIBRARIES}) - lapack_install_library(cblas) + target_link_libraries(${CBLASLIB} PRIVATE ${BLAS_LIBRARIES}) + lapack_install_library(${CBLASLIB}) diff --git a/CMAKE/lapack-config-build.cmake.in b/CMAKE/lapack-config-build.cmake.in deleted file mode 100644 --- a/CMAKE/lapack-config-build.cmake.in @@ -146,7 +146,7 @@ deleted file mode 100644 -# Load lapack targets from the build tree if necessary. -set(_LAPACK_TARGET "@_lapack_config_build_guard_target@") -if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}") -- include("@LAPACK_BINARY_DIR@/lapack-targets.cmake") +- include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake") -endif() -unset(_LAPACK_TARGET) - @@ -168,7 +168,7 @@ deleted file mode 100644 -# Load lapack targets from the install tree if necessary. -set(_LAPACK_TARGET "@_lapack_config_install_guard_target@") -if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}") -- include("${_LAPACK_SELF_DIR}/lapack-targets.cmake") +- include("${_LAPACK_SELF_DIR}/@LAPACKLIB@-targets.cmake") -endif() -unset(_LAPACK_TARGET) - @@ -184,11 +184,11 @@ deleted file mode 100644 diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -112,11 +112,8 @@ +@@ -160,11 +160,8 @@ # -------------------------------------------------- --set(LAPACK_INSTALL_EXPORT_NAME lapack-targets) +-set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKLIB}-targets) - macro(lapack_install_library lib) install(TARGETS ${lib} @@ -196,7 +196,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT RuntimeLibraries -@@ -155,21 +152,6 @@ +@@ -204,21 +201,6 @@ include(CheckLAPACKCompilerFlags) CheckLAPACKCompilerFlags() @@ -204,7 +204,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -# Check second function - -include(CheckTimeFunction) --set(TIME_FUNC NONE ${TIME_FUNC}) +-set(NONE ${TIME_FUNC}) -CHECK_TIME_FUNCTION(NONE TIME_FUNC) -CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC) -CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC) @@ -218,7 +218,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt # deprecated LAPACK and LAPACKE routines option(BUILD_DEPRECATED "Build deprecated routines" OFF) message(STATUS "Build deprecated routines: ${BUILD_DEPRECATED}") -@@ -193,8 +175,9 @@ +@@ -242,8 +224,9 @@ endif() # -------------------------------------------------- @@ -229,7 +229,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt # Check the usage of the user provided BLAS libraries if(BLAS_LIBRARIES) -@@ -205,113 +188,108 @@ +@@ -254,113 +237,108 @@ if(BLAS_FOUND) message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.") else() @@ -250,7 +250,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt - message(STATUS "Using supplied NETLIB BLAS implementation") - add_subdirectory(BLAS) +elseif(BUILD_BLAS) - set(BLAS_LIBRARIES blas) + set(BLAS_LIBRARIES ${BLASLIB}) -else() - set(CMAKE_EXE_LINKER_FLAGS - "${CMAKE_EXE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}" @@ -326,14 +326,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt + find_package(LAPACK) + +elseif(BUILD_LAPACK) - set(LAPACK_LIBRARIES lapack) + set(LAPACK_LIBRARIES ${LAPACKLIB}) + set(LAPACK_FOUND TRUE) + + set(NEED_BLAS TRUE) + + # Check second function + include(CheckTimeFunction) -+ set(TIME_FUNC NONE ${TIME_FUNC}) ++ set(NONE ${TIME_FUNC}) + CHECK_TIME_FUNCTION(NONE TIME_FUNC) + CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC) + CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC) @@ -363,9 +363,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt + add_subdirectory(TESTING) + endif() + -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc @ONLY) + install(FILES -+ ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc ++ ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc + DESTINATION ${PKG_CONFIG_DIR} + COMPONENT Development + ) @@ -393,8 +393,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt add_subdirectory(LAPACKE) endif() -@@ -338,109 +316,12 @@ - _display_cpp_implementation_msg("LAPACK") +@@ -414,111 +392,16 @@ + ExternalProject_Add_StepDependencies(lapackpp build blaspp ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}) endif() -# -------------------------------------------------- @@ -430,23 +430,23 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -# -------------------------------------------------- - -if(NOT BLAS_FOUND) -- set(ALL_TARGETS ${ALL_TARGETS} blas) +- set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB}) -endif() - -if(NOT LATESTLAPACK_FOUND) -- set(ALL_TARGETS ${ALL_TARGETS} lapack) +- set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKLIB}) -endif() - -if(BUILD_TESTING OR LAPACKE_WITH_TMG) -- set(ALL_TARGETS ${ALL_TARGETS} tmglib) +- set(ALL_TARGETS ${ALL_TARGETS} ${TMGLIB}) -endif() - -# Export lapack targets, not including lapacke, from the -# install tree, if any. -set(_lapack_config_install_guard_target "") -if(ALL_TARGETS) -- install(EXPORT lapack-targets -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION} +- install(EXPORT ${LAPACKLIB}-targets +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION} - COMPONENT Development - ) - @@ -457,12 +457,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt - -# Include cblas in targets exported from the build tree. -if(CBLAS) -- set(ALL_TARGETS ${ALL_TARGETS} cblas) +- set(ALL_TARGETS ${ALL_TARGETS} ${CBLASLIB}) -endif() - -# Include lapacke in targets exported from the build tree. -if(LAPACKE) -- set(ALL_TARGETS ${ALL_TARGETS} lapacke) +- set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKELIB}) +# Neither user specified or optimized BLAS libraries can be used +if(NEED_BLAS AND NOT BLAS_FOUND) + message(FATAL_ERROR "--> No BLAS library found. Specify BLAS_LIBRARIES or enable USE_OPTIMIZED_BLAS or BUILD_BLAS.") @@ -471,7 +471,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -# Export lapack and lapacke targets from the build tree, if any. -set(_lapack_config_build_guard_target "") -if(ALL_TARGETS) -- export(TARGETS ${ALL_TARGETS} FILE lapack-targets.cmake) +- export(TARGETS ${ALL_TARGETS} FILE ${LAPACKLIB}-targets.cmake) - - # Choose one of the lapack or lapacke targets to use as a guard - # for lapack-config.cmake to load targets from the build tree. @@ -480,36 +480,37 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt +if(NEED_LAPACK AND NOT LAPACK_FOUND) + message(FATAL_ERROR "--> No LAPACK library found. Specify LAPACK_LIBRARIES or enable USE_OPTIMIZED_LAPACK or BUILD_LAPACK.") endif() -- + -configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in -- ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config.cmake @ONLY) - - --configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY) +-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc @ONLY) - install(FILES -- ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc +- ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc - DESTINATION ${PKG_CONFIG_DIR} - COMPONENT Development - ) - -configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in -- ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/CMakeFiles/${LAPACKLIB}-config.cmake @ONLY) - -include(CMakePackageConfigHelpers) -write_basic_package_version_file( -- ${LAPACK_BINARY_DIR}/lapack-config-version.cmake +- ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config-version.cmake - VERSION ${LAPACK_VERSION} - COMPATIBILITY SameMajorVersion - ) - -install(FILES -- ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake -- ${LAPACK_BINARY_DIR}/lapack-config-version.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION} +- ${LAPACK_BINARY_DIR}/CMakeFiles/${LAPACKLIB}-config.cmake +- ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config-version.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION} - COMPONENT Development - ) -- -\ No newline at end of file + if (LAPACK++) + install( + DIRECTORY "${LAPACK_BINARY_DIR}/lib/" diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt --- a/LAPACKE/CMakeLists.txt +++ b/LAPACKE/CMakeLists.txt @@ -517,7 +518,7 @@ diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt message(STATUS "LAPACKE enable") enable_language(C) --set(LAPACK_INSTALL_EXPORT_NAME lapacke-targets) +-set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKELIB}-targets) - # Create a header file lapacke_mangling.h for the routines called in my C programs include(FortranCInterface) @@ -526,38 +527,38 @@ diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt VERSION ${LAPACK_VERSION} SOVERSION ${LAPACK_MAJOR_VERSION} ) --target_include_directories(lapacke PUBLIC +-target_include_directories(${LAPACKELIB} PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> - $<INSTALL_INTERFACE:include> -) -if(WIN32 AND NOT UNIX) -- target_compile_definitions(lapacke PUBLIC HAVE_LAPACK_CONFIG_H LAPACK_COMPLEX_STRUCTURE) +- target_compile_definitions(${LAPACKELIB} PUBLIC HAVE_LAPACK_CONFIG_H LAPACK_COMPLEX_STRUCTURE) - message(STATUS "Windows BUILD") -endif() if(LAPACKE_WITH_TMG) - target_link_libraries(lapacke PRIVATE tmglib) + target_link_libraries(${LAPACKELIB} PRIVATE ${TMGLIB}) @@ -111,22 +101,3 @@ DESTINATION ${PKG_CONFIG_DIR} COMPONENT Development ) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-version.cmake.in -- ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config-version.cmake @ONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-build.cmake.in -- ${LAPACK_BINARY_DIR}/lapacke-config.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config.cmake @ONLY) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-install.cmake.in -- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake @ONLY) +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LAPACKELIB}-config.cmake @ONLY) -install(FILES -- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake -- ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION} +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LAPACKELIB}-config.cmake +- ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config-version.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKELIB}-${LAPACK_VERSION} - COMPONENT Development - ) - --install(EXPORT lapacke-targets -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION} +-install(EXPORT ${LAPACKELIB}-targets +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKELIB}-${LAPACK_VERSION} - COMPONENT Development - ) diff --git a/LAPACKE/cmake/lapacke-config-build.cmake.in b/LAPACKE/cmake/lapacke-config-build.cmake.in @@ -570,8 +571,8 @@ deleted file mode 100644 -find_package(LAPACK NO_MODULE) - -# Load lapack targets from the build tree, including lapacke targets. --if(NOT TARGET lapacke) -- include("@LAPACK_BINARY_DIR@/lapack-targets.cmake") +-if(NOT TARGET @LAPACKELIB@) +- include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake") -endif() - -# Hint for project building against lapack @@ -581,7 +582,7 @@ deleted file mode 100644 -set(LAPACKE_INCLUDE_DIRS "@LAPACK_BINARY_DIR@/include") - -# Report lapacke libraries. --set(LAPACKE_LIBRARIES lapacke ${LAPACK_LIBRARIES}) +-set(LAPACKE_LIBRARIES @LAPACKELIB@ ${LAPACK_LIBRARIES}) diff --git a/LAPACKE/cmake/lapacke-config-install.cmake.in b/LAPACKE/cmake/lapacke-config-install.cmake.in deleted file mode 100644 --- a/LAPACKE/cmake/lapacke-config-install.cmake.in @@ -594,12 +595,12 @@ deleted file mode 100644 -get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_PREFIX}" PATH) - -# Load the LAPACK package with which we were built. --set(LAPACK_DIR "${_LAPACKE_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/lapack-@LAPACK_VERSION@") +-set(LAPACK_DIR "${_LAPACKE_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/@LAPACK@-@LAPACK_VERSION@") -find_package(LAPACK NO_MODULE) - -# Load lapacke targets from the install tree. --if(NOT TARGET lapacke) -- include(${_LAPACKE_SELF_DIR}/lapacke-targets.cmake) +-if(NOT TARGET @LAPACKELIB@) +- include(${_LAPACKE_SELF_DIR}/@LAPACKELIB@-targets.cmake) -endif() - -# Hint for project building against lapack @@ -609,7 +610,7 @@ deleted file mode 100644 -set(LAPACKE_INCLUDE_DIRS ${_LAPACKE_PREFIX}/include) - -# Report lapacke libraries. --set(LAPACKE_LIBRARIES lapacke ${LAPACK_LIBRARIES}) +-set(LAPACKE_LIBRARIES @LAPACKELIB@ ${LAPACK_LIBRARIES}) - -unset(_LAPACKE_PREFIX) -unset(_LAPACKE_SELF_DIR) diff --git a/academic/lapacke/README b/academic/lapacke/README index 892bc75de9..118c2449de 100644 --- a/academic/lapacke/README +++ b/academic/lapacke/README @@ -6,5 +6,7 @@ This package is intended for use with the Netlib reference LAPACK. It should also work with other LAPACK implementations that do not already provide a LAPACKE implementation. +xblas is an optional dependency. + To build a static library in addition to the shared library, pass STATIC=yes to the script. diff --git a/academic/lapacke/lapacke.SlackBuild b/academic/lapacke/lapacke.SlackBuild index e0c9fe36d0..b7bac2704f 100644 --- a/academic/lapacke/lapacke.SlackBuild +++ b/academic/lapacke/lapacke.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for LAPACKE -# Copyright 2016-2020 Kyle Guinn <elyk03@gmail.com> +# Copyright 2016-2021 Kyle Guinn <elyk03@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=lapacke SRCNAM=lapack -VERSION=${VERSION:-3.9.0} +VERSION=${VERSION:-3.9.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,6 +69,10 @@ chmod -R u+w,go-w,a+rX-st . # Allow building only the LAPACKE component. patch -p1 < $CWD/patches/cmake-piecewise.diff +if pkg-config --exists xblas; then + use_xblas='-DUSE_XBLAS=ON' +fi + # Avoid adding an RPATH entry to the shared lib. It's unnecessary (except for # running the test suite), and it's broken on 64-bit (needs LIBDIRSUFFIX). mkdir -p shared @@ -82,6 +86,7 @@ cd shared -DUSE_OPTIMIZED_LAPACK=ON \ -DBUILD_LAPACKE=ON \ -DBUILD_DEPRECATED=ON \ + $use_xblas \ -DBUILD_SHARED_LIBS=ON \ -DCMAKE_SKIP_RPATH=YES \ .. @@ -104,6 +109,7 @@ if [ "${STATIC:-no}" != "no" ]; then -DUSE_OPTIMIZED_LAPACK=ON \ -DBUILD_LAPACKE=ON \ -DBUILD_DEPRECATED=ON \ + $use_xblas \ .. make make install/strip DESTDIR=$PKG diff --git a/academic/lapacke/lapacke.info b/academic/lapacke/lapacke.info index d674e494bd..aa77adac19 100644 --- a/academic/lapacke/lapacke.info +++ b/academic/lapacke/lapacke.info @@ -1,8 +1,8 @@ PRGNAM="lapacke" -VERSION="3.9.0" +VERSION="3.9.1" HOMEPAGE="https://www.netlib.org/lapack/lapacke.html" -DOWNLOAD="https://github.com/Reference-LAPACK/lapack/archive/v3.9.0/lapack-3.9.0.tar.gz" -MD5SUM="0b251e2a8d5f949f99b50dd5e2200ee2" +DOWNLOAD="https://github.com/Reference-LAPACK/lapack/archive/v3.9.1/lapack-3.9.1.tar.gz" +MD5SUM="47ab2d11652045145df37ddbe2a32d71" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lapack" diff --git a/academic/lapacke/patches/cmake-piecewise.diff b/academic/lapacke/patches/cmake-piecewise.diff index b1bdfaec1e..378acc8769 100644 --- a/academic/lapacke/patches/cmake-piecewise.diff +++ b/academic/lapacke/patches/cmake-piecewise.diff @@ -5,25 +5,25 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt message(STATUS "CBLAS enable") enable_language(C) --set(LAPACK_INSTALL_EXPORT_NAME cblas-targets) +-set(LAPACK_INSTALL_EXPORT_NAME ${CBLASLIB}-targets) - # Create a header file cblas.h for the routines called in my C programs include(FortranCInterface) ## Ensure that the fortran compiler and c compiler specified are compatible -@@ -41,54 +39,8 @@ +@@ -45,54 +43,8 @@ add_subdirectory(examples) endif() -if(NOT BLAS_FOUND) -- set(ALL_TARGETS ${ALL_TARGETS} blas) +- set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB}) -endif() - -# Export cblas targets from the -# install tree, if any. -set(_cblas_config_install_guard_target "") -if(ALL_TARGETS) -- install(EXPORT cblas-targets -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION} +- install(EXPORT ${CBLASLIB}-targets +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION} - COMPONENT Development - ) - # Choose one of the cblas targets to use as a guard for @@ -34,7 +34,7 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt -# Export cblas targets from the build tree, if any. -set(_cblas_config_build_guard_target "") -if(ALL_TARGETS) -- export(TARGETS ${ALL_TARGETS} FILE cblas-targets.cmake) +- export(TARGETS ${ALL_TARGETS} FILE ${CBLASLIB}-targets.cmake) - - # Choose one of the cblas targets to use as a guard - # for cblas-config.cmake to load targets from the build tree. @@ -42,27 +42,27 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt -endif() - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-version.cmake.in -- ${LAPACK_BINARY_DIR}/cblas-config-version.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${CBLASLIB}-config-version.cmake @ONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-build.cmake.in -- ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${CBLASLIB}-config.cmake @ONLY) - - - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}.pc @ONLY) install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc + ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}.pc DESTINATION ${PKG_CONFIG_DIR} ) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-install.cmake.in -- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake @ONLY) +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CBLASLIB}-config.cmake @ONLY) -install(FILES -- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake -- ${LAPACK_BINARY_DIR}/cblas-config-version.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION} +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CBLASLIB}-config.cmake +- ${LAPACK_BINARY_DIR}/${CBLASLIB}-config-version.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION} - ) - --#install(EXPORT cblas-targets --# DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION} +-#install(EXPORT ${CBLASLIB}-targets +-# DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION} -# COMPONENT Development -# ) diff --git a/CBLAS/cmake/cblas-config-build.cmake.in b/CBLAS/cmake/cblas-config-build.cmake.in @@ -76,14 +76,14 @@ deleted file mode 100644 - -# Load lapack targets from the build tree, including lapacke targets. -if(NOT TARGET lapacke) -- include("@LAPACK_BINARY_DIR@/lapack-targets.cmake") +- include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake") -endif() - -# Report cblas header search locations from build tree. -set(CBLAS_INCLUDE_DIRS "@LAPACK_BINARY_DIR@/include") - -# Report cblas libraries. --set(CBLAS_LIBRARIES cblas) +-set(CBLAS_LIBRARIES @CBLASLIB@) diff --git a/CBLAS/cmake/cblas-config-install.cmake.in b/CBLAS/cmake/cblas-config-install.cmake.in deleted file mode 100644 --- a/CBLAS/cmake/cblas-config-install.cmake.in @@ -96,19 +96,19 @@ deleted file mode 100644 -get_filename_component(_CBLAS_PREFIX "${_CBLAS_PREFIX}" PATH) - -# Load the LAPACK package with which we were built. --set(LAPACK_DIR "${_CBLAS_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/lapack-@LAPACK_VERSION@") +-set(LAPACK_DIR "${_CBLAS_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/@LAPACKLIB@-@LAPACK_VERSION@") -find_package(LAPACK NO_MODULE) - -# Load lapacke targets from the install tree. --if(NOT TARGET cblas) -- include(${_CBLAS_SELF_DIR}/cblas-targets.cmake) +-if(NOT TARGET @CBLASLIB@) +- include(${_CBLAS_SELF_DIR}/@CBLASLIB@-targets.cmake) -endif() - -# Report lapacke header search locations. -set(CBLAS_INCLUDE_DIRS ${_CBLAS_PREFIX}/include) - -# Report lapacke libraries. --set(CBLAS_LIBRARIES cblas) +-set(CBLAS_LIBRARIES @CBLASLIB@) - -unset(_CBLAS_PREFIX) -unset(_CBLAS_SELF_DIR) @@ -128,16 +128,16 @@ deleted file mode 100644 diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt --- a/CBLAS/src/CMakeLists.txt +++ b/CBLAS/src/CMakeLists.txt -@@ -120,9 +120,5 @@ - VERSION ${LAPACK_VERSION} - SOVERSION ${LAPACK_MAJOR_VERSION} - ) --target_include_directories(cblas PUBLIC +@@ -123,9 +123,5 @@ + if(HAS_ATTRIBUTE_WEAK_SUPPORT) + target_compile_definitions(${CBLASLIB} PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT) + endif() +-target_include_directories(${CBLASLIB} PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> - $<INSTALL_INTERFACE:include> -) - target_link_libraries(cblas PRIVATE ${BLAS_LIBRARIES}) - lapack_install_library(cblas) + target_link_libraries(${CBLASLIB} PRIVATE ${BLAS_LIBRARIES}) + lapack_install_library(${CBLASLIB}) diff --git a/CMAKE/lapack-config-build.cmake.in b/CMAKE/lapack-config-build.cmake.in deleted file mode 100644 --- a/CMAKE/lapack-config-build.cmake.in @@ -146,7 +146,7 @@ deleted file mode 100644 -# Load lapack targets from the build tree if necessary. -set(_LAPACK_TARGET "@_lapack_config_build_guard_target@") -if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}") -- include("@LAPACK_BINARY_DIR@/lapack-targets.cmake") +- include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake") -endif() -unset(_LAPACK_TARGET) - @@ -168,7 +168,7 @@ deleted file mode 100644 -# Load lapack targets from the install tree if necessary. -set(_LAPACK_TARGET "@_lapack_config_install_guard_target@") -if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}") -- include("${_LAPACK_SELF_DIR}/lapack-targets.cmake") +- include("${_LAPACK_SELF_DIR}/@LAPACKLIB@-targets.cmake") -endif() -unset(_LAPACK_TARGET) - @@ -184,11 +184,11 @@ deleted file mode 100644 diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -112,11 +112,8 @@ +@@ -160,11 +160,8 @@ # -------------------------------------------------- --set(LAPACK_INSTALL_EXPORT_NAME lapack-targets) +-set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKLIB}-targets) - macro(lapack_install_library lib) install(TARGETS ${lib} @@ -196,7 +196,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT RuntimeLibraries -@@ -155,21 +152,6 @@ +@@ -204,21 +201,6 @@ include(CheckLAPACKCompilerFlags) CheckLAPACKCompilerFlags() @@ -204,7 +204,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -# Check second function - -include(CheckTimeFunction) --set(TIME_FUNC NONE ${TIME_FUNC}) +-set(NONE ${TIME_FUNC}) -CHECK_TIME_FUNCTION(NONE TIME_FUNC) -CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC) -CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC) @@ -218,7 +218,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt # deprecated LAPACK and LAPACKE routines option(BUILD_DEPRECATED "Build deprecated routines" OFF) message(STATUS "Build deprecated routines: ${BUILD_DEPRECATED}") -@@ -193,8 +175,9 @@ +@@ -242,8 +224,9 @@ endif() # -------------------------------------------------- @@ -229,7 +229,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt # Check the usage of the user provided BLAS libraries if(BLAS_LIBRARIES) -@@ -205,113 +188,108 @@ +@@ -254,113 +237,108 @@ if(BLAS_FOUND) message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.") else() @@ -250,7 +250,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt - message(STATUS "Using supplied NETLIB BLAS implementation") - add_subdirectory(BLAS) +elseif(BUILD_BLAS) - set(BLAS_LIBRARIES blas) + set(BLAS_LIBRARIES ${BLASLIB}) -else() - set(CMAKE_EXE_LINKER_FLAGS - "${CMAKE_EXE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}" @@ -326,14 +326,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt + find_package(LAPACK) + +elseif(BUILD_LAPACK) - set(LAPACK_LIBRARIES lapack) + set(LAPACK_LIBRARIES ${LAPACKLIB}) + set(LAPACK_FOUND TRUE) + + set(NEED_BLAS TRUE) + + # Check second function + include(CheckTimeFunction) -+ set(TIME_FUNC NONE ${TIME_FUNC}) ++ set(NONE ${TIME_FUNC}) + CHECK_TIME_FUNCTION(NONE TIME_FUNC) + CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC) + CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC) @@ -363,9 +363,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt + add_subdirectory(TESTING) + endif() + -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc @ONLY) + install(FILES -+ ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc ++ ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc + DESTINATION ${PKG_CONFIG_DIR} + COMPONENT Development + ) @@ -393,8 +393,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt add_subdirectory(LAPACKE) endif() -@@ -338,109 +316,12 @@ - _display_cpp_implementation_msg("LAPACK") +@@ -414,111 +392,16 @@ + ExternalProject_Add_StepDependencies(lapackpp build blaspp ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}) endif() -# -------------------------------------------------- @@ -430,23 +430,23 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -# -------------------------------------------------- - -if(NOT BLAS_FOUND) -- set(ALL_TARGETS ${ALL_TARGETS} blas) +- set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB}) -endif() - -if(NOT LATESTLAPACK_FOUND) -- set(ALL_TARGETS ${ALL_TARGETS} lapack) +- set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKLIB}) -endif() - -if(BUILD_TESTING OR LAPACKE_WITH_TMG) -- set(ALL_TARGETS ${ALL_TARGETS} tmglib) +- set(ALL_TARGETS ${ALL_TARGETS} ${TMGLIB}) -endif() - -# Export lapack targets, not including lapacke, from the -# install tree, if any. -set(_lapack_config_install_guard_target "") -if(ALL_TARGETS) -- install(EXPORT lapack-targets -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION} +- install(EXPORT ${LAPACKLIB}-targets +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION} - COMPONENT Development - ) - @@ -457,12 +457,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt - -# Include cblas in targets exported from the build tree. -if(CBLAS) -- set(ALL_TARGETS ${ALL_TARGETS} cblas) +- set(ALL_TARGETS ${ALL_TARGETS} ${CBLASLIB}) -endif() - -# Include lapacke in targets exported from the build tree. -if(LAPACKE) -- set(ALL_TARGETS ${ALL_TARGETS} lapacke) +- set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKELIB}) +# Neither user specified or optimized BLAS libraries can be used +if(NEED_BLAS AND NOT BLAS_FOUND) + message(FATAL_ERROR "--> No BLAS library found. Specify BLAS_LIBRARIES or enable USE_OPTIMIZED_BLAS or BUILD_BLAS.") @@ -471,7 +471,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -# Export lapack and lapacke targets from the build tree, if any. -set(_lapack_config_build_guard_target "") -if(ALL_TARGETS) -- export(TARGETS ${ALL_TARGETS} FILE lapack-targets.cmake) +- export(TARGETS ${ALL_TARGETS} FILE ${LAPACKLIB}-targets.cmake) - - # Choose one of the lapack or lapacke targets to use as a guard - # for lapack-config.cmake to load targets from the build tree. @@ -480,36 +480,37 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt +if(NEED_LAPACK AND NOT LAPACK_FOUND) + message(FATAL_ERROR "--> No LAPACK library found. Specify LAPACK_LIBRARIES or enable USE_OPTIMIZED_LAPACK or BUILD_LAPACK.") endif() -- + -configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in -- ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config.cmake @ONLY) - - --configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY) +-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc @ONLY) - install(FILES -- ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc +- ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc - DESTINATION ${PKG_CONFIG_DIR} - COMPONENT Development - ) - -configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in -- ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/CMakeFiles/${LAPACKLIB}-config.cmake @ONLY) - -include(CMakePackageConfigHelpers) -write_basic_package_version_file( -- ${LAPACK_BINARY_DIR}/lapack-config-version.cmake +- ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config-version.cmake - VERSION ${LAPACK_VERSION} - COMPATIBILITY SameMajorVersion - ) - -install(FILES -- ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake -- ${LAPACK_BINARY_DIR}/lapack-config-version.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION} +- ${LAPACK_BINARY_DIR}/CMakeFiles/${LAPACKLIB}-config.cmake +- ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config-version.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION} - COMPONENT Development - ) -- -\ No newline at end of file + if (LAPACK++) + install( + DIRECTORY "${LAPACK_BINARY_DIR}/lib/" diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt --- a/LAPACKE/CMakeLists.txt +++ b/LAPACKE/CMakeLists.txt @@ -517,7 +518,7 @@ diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt message(STATUS "LAPACKE enable") enable_language(C) --set(LAPACK_INSTALL_EXPORT_NAME lapacke-targets) +-set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKELIB}-targets) - # Create a header file lapacke_mangling.h for the routines called in my C programs include(FortranCInterface) @@ -526,38 +527,38 @@ diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt VERSION ${LAPACK_VERSION} SOVERSION ${LAPACK_MAJOR_VERSION} ) --target_include_directories(lapacke PUBLIC +-target_include_directories(${LAPACKELIB} PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> - $<INSTALL_INTERFACE:include> -) -if(WIN32 AND NOT UNIX) -- target_compile_definitions(lapacke PUBLIC HAVE_LAPACK_CONFIG_H LAPACK_COMPLEX_STRUCTURE) +- target_compile_definitions(${LAPACKELIB} PUBLIC HAVE_LAPACK_CONFIG_H LAPACK_COMPLEX_STRUCTURE) - message(STATUS "Windows BUILD") -endif() if(LAPACKE_WITH_TMG) - target_link_libraries(lapacke PRIVATE tmglib) + target_link_libraries(${LAPACKELIB} PRIVATE ${TMGLIB}) @@ -111,22 +101,3 @@ DESTINATION ${PKG_CONFIG_DIR} COMPONENT Development ) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-version.cmake.in -- ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config-version.cmake @ONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-build.cmake.in -- ${LAPACK_BINARY_DIR}/lapacke-config.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config.cmake @ONLY) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-install.cmake.in -- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake @ONLY) +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LAPACKELIB}-config.cmake @ONLY) -install(FILES -- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake -- ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION} +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LAPACKELIB}-config.cmake +- ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config-version.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKELIB}-${LAPACK_VERSION} - COMPONENT Development - ) - --install(EXPORT lapacke-targets -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION} +-install(EXPORT ${LAPACKELIB}-targets +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKELIB}-${LAPACK_VERSION} - COMPONENT Development - ) diff --git a/LAPACKE/cmake/lapacke-config-build.cmake.in b/LAPACKE/cmake/lapacke-config-build.cmake.in @@ -570,8 +571,8 @@ deleted file mode 100644 -find_package(LAPACK NO_MODULE) - -# Load lapack targets from the build tree, including lapacke targets. --if(NOT TARGET lapacke) -- include("@LAPACK_BINARY_DIR@/lapack-targets.cmake") +-if(NOT TARGET @LAPACKELIB@) +- include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake") -endif() - -# Hint for project building against lapack @@ -581,7 +582,7 @@ deleted file mode 100644 -set(LAPACKE_INCLUDE_DIRS "@LAPACK_BINARY_DIR@/include") - -# Report lapacke libraries. --set(LAPACKE_LIBRARIES lapacke ${LAPACK_LIBRARIES}) +-set(LAPACKE_LIBRARIES @LAPACKELIB@ ${LAPACK_LIBRARIES}) diff --git a/LAPACKE/cmake/lapacke-config-install.cmake.in b/LAPACKE/cmake/lapacke-config-install.cmake.in deleted file mode 100644 --- a/LAPACKE/cmake/lapacke-config-install.cmake.in @@ -594,12 +595,12 @@ deleted file mode 100644 -get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_PREFIX}" PATH) - -# Load the LAPACK package with which we were built. --set(LAPACK_DIR "${_LAPACKE_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/lapack-@LAPACK_VERSION@") +-set(LAPACK_DIR "${_LAPACKE_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/@LAPACK@-@LAPACK_VERSION@") -find_package(LAPACK NO_MODULE) - -# Load lapacke targets from the install tree. --if(NOT TARGET lapacke) -- include(${_LAPACKE_SELF_DIR}/lapacke-targets.cmake) +-if(NOT TARGET @LAPACKELIB@) +- include(${_LAPACKE_SELF_DIR}/@LAPACKELIB@-targets.cmake) -endif() - -# Hint for project building against lapack @@ -609,7 +610,7 @@ deleted file mode 100644 -set(LAPACKE_INCLUDE_DIRS ${_LAPACKE_PREFIX}/include) - -# Report lapacke libraries. --set(LAPACKE_LIBRARIES lapacke ${LAPACK_LIBRARIES}) +-set(LAPACKE_LIBRARIES @LAPACKELIB@ ${LAPACK_LIBRARIES}) - -unset(_LAPACKE_PREFIX) -unset(_LAPACKE_SELF_DIR) diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild index 7660cb6ca7..11493d831c 100644 --- a/academic/octave/octave.SlackBuild +++ b/academic/octave/octave.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=octave -VERSION=${VERSION:-6.1.0} +VERSION=${VERSION:-6.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -91,8 +91,6 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go-w,a+rX-st . -patch -p1 < $CWD/patches/87ca5976c648.diff # https://savannah.gnu.org/bugs/?59806 -patch -p1 -F3 < $CWD/patches/0348f3f57e3c.diff # https://savannah.gnu.org/bugs/?59813 patch -p1 < $CWD/patches/imagemagick.diff # https://savannah.gnu.org/bugs/?49653 patch -p1 < $CWD/patches/atlas-lib-rename.diff autoreconf -vif diff --git a/academic/octave/octave.info b/academic/octave/octave.info index af96716f60..d8b41a92ad 100644 --- a/academic/octave/octave.info +++ b/academic/octave/octave.info @@ -1,8 +1,8 @@ PRGNAM="octave" -VERSION="6.1.0" +VERSION="6.2.0" HOMEPAGE="https://www.gnu.org/software/octave/" -DOWNLOAD="https://ftpmirror.gnu.org/gnu/octave/octave-6.1.0.tar.lz" -MD5SUM="350315cf2bf16169b8710e70154c86ad" +DOWNLOAD="https://ftpmirror.gnu.org/gnu/octave/octave-6.2.0.tar.lz" +MD5SUM="5de14d8561af9799e2ecf6bedfbdb346" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README% lapack" diff --git a/academic/octave/patches/0348f3f57e3c.diff b/academic/octave/patches/0348f3f57e3c.diff deleted file mode 100644 index 1545797a61..0000000000 --- a/academic/octave/patches/0348f3f57e3c.diff +++ /dev/null @@ -1,170 +0,0 @@ - -# HG changeset patch -# User John W. Eaton <jwe@octave.org> -# Date 1609785454 18000 -# Node ID 0348f3f57e3ca6fa7c8e5112622c756d00dd7dab -# Parent a3d92c4ad5502686daf2b34f062db6c950db30ef -avoid build errors with Qt4 (bug #59813) - -* acinclude.m4 (OCTAVE_CHECK_FUNC_QFONTDATABASE_SYSTEMFONT, -OCTAVE_CHECK_QVARIANT_CANCONVERT_ACCEPTS_QMETATYPE_TYPE): New macros. -(OCTAVE_CHECK_QT_VERSION): Use them. - -* resource-manager.cc (resource_manager::get_default_font_family): -Check availability of QFontDatabase::systemFont, fall back on -QFont::setStyleHint, then global_font_family. - -* octave-dock-widget.cc (octave_dock_widget::handle_settings): -Check whether QVariant::canConvert accepts QMetatype::Type. Use -QVariant::Type as fallback. -* variable-editor-model.cc (variable_editor_model::setData): Likewise. - -diff --git a/libgui/src/octave-dock-widget.cc b/libgui/src/octave-dock-widget.cc ---- a/libgui/src/octave-dock-widget.cc -+++ b/libgui/src/octave-dock-widget.cc -@@ -507,7 +507,12 @@ - QVariant dock_geom - = settings->value (dw_dock_geometry.key.arg (objectName ()), - default_dock_size); -- if (dock_geom.canConvert (QMetaType::QRect)) -+#if defined (QVARIANT_CANCONVERT_ACCEPTS_QMETATYPE_TYPE) -+ QMetaType::Type rect_type = QMetaType::QRect; -+#else -+ QVariant::Type rect_type = QVariant::Rect; -+#endif -+ if (dock_geom.canConvert (rect_type)) - m_recent_dock_geom = dock_geom.toRect (); - else - m_recent_dock_geom = dw_dock_geometry.def.toRect (); -diff --git a/libgui/src/resource-manager.cc b/libgui/src/resource-manager.cc ---- a/libgui/src/resource-manager.cc -+++ b/libgui/src/resource-manager.cc -@@ -241,9 +241,17 @@ - // if macOS default font is not available): use QFontDatabase - if (default_family.isEmpty ()) - { -+#if defined (HAVE_QFONTDATABASE_SYSTEMFONT) - // Get the system's default monospaced font - QFont fixed_font = QFontDatabase::systemFont (QFontDatabase::FixedFont); - default_family = fixed_font.defaultFamily (); -+#elif defined (HAVE_QFONT_MONOSPACE) -+ QFont fixed_font; -+ fixed_font.setStyleHint (QFont::Monospace); -+ default_family = fixed_font.defaultFamily (); -+#else -+ default_family = global_font_family; -+#endif - } - - // Test env variable which has preference -diff --git a/libgui/src/variable-editor-model.cc b/libgui/src/variable-editor-model.cc ---- a/libgui/src/variable-editor-model.cc -+++ b/libgui/src/variable-editor-model.cc -@@ -987,7 +987,12 @@ - variable_editor_model::setData (const QModelIndex& idx, - const QVariant& v_user_input, int role) - { -- if (role != Qt::EditRole || ! v_user_input.canConvert (QVariant::String) -+#if defined (QVARIANT_CANCONVERT_ACCEPTS_QMETATYPE_TYPE) -+ QMetaType::Type string_type = QMetaType::QString; -+#else -+ QVariant::Type string_type = QVariant::String; -+#endif -+ if (role != Qt::EditRole || ! v_user_input.canConvert (string_type) - || ! idx.isValid ()) - return false; - -diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 ---- a/m4/acinclude.m4 -+++ b/m4/acinclude.m4 -@@ -1091,6 +1091,35 @@ - fi - ]) - dnl -+dnl Check whether the Qt class QFontDatabase has the systemFont member -+dnl function. This function was introduced in Qt 5.2. -+dnl -+AC_DEFUN([OCTAVE_CHECK_FUNC_QFONTDATABASE_SYSTEMFONT], [ -+ AC_CACHE_CHECK([for QFontDatabase::systemFont function], -+ [octave_cv_func_qfontdatabase_systemfont], -+ [AC_LANG_PUSH(C++) -+ ac_octave_save_CPPFLAGS="$CPPFLAGS" -+ ac_octave_save_CXXFLAGS="$CXXFLAGS" -+ CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" -+ CXXFLAGS="$CXXPICFLAG $CXXFLAGS" -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+ #include <QFontDatabase> -+ #include <QFont> -+ ]], [[ -+ QFont font = QFontDatabase::systemFont (QFontDatabase::FixedFont); -+ ]])], -+ octave_cv_func_qfontdatabase_systemfont=yes, -+ octave_cv_func_qfontdatabase_systemfont=no) -+ CPPFLAGS="$ac_octave_save_CPPFLAGS" -+ CXXFLAGS="$ac_octave_save_CXXFLAGS" -+ AC_LANG_POP(C++) -+ ]) -+ if test $octave_cv_func_qfontdatabase_systemfont = yes; then -+ AC_DEFINE(HAVE_QFONTDATABASE_SYSTEMFONT, 1, -+ [Define to 1 if you have the `QFontDatabase::systemFont' function.]) -+ fi -+]) -+dnl - dnl Check whether the Qt class QList has a constructor that accepts - dnl a pair of iterators. This constructor was introduced in Qt 5.14. - dnl -@@ -1967,6 +1996,37 @@ - fi - ]) - dnl -+dnl Check whether QVariant::canConvert accepts a QMetaType::Type -+dnl enumeration value as an argument. -+dnl -+AC_DEFUN([OCTAVE_CHECK_QVARIANT_CANCONVERT_ACCEPTS_QMETATYPE_TYPE], [ -+ AC_CACHE_CHECK([whether QVariant::canConvert accepts QMetaType::Type argument], -+ [octave_cv_qvariant_canconvert_accepts_qmetatype_type], -+ [AC_LANG_PUSH(C++) -+ ac_octave_save_CPPFLAGS="$CPPFLAGS" -+ ac_octave_save_CXXFLAGS="$CXXFLAGS" -+ CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" -+ CXXFLAGS="$CXXPICFLAG $CXXFLAGS" -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+ #include <QMetaType> -+ #include <QVariant> -+ ]], [[ -+ QVariant var; -+ QMetaType::Type type = QMetaType::QString; -+ var.canConvert (type); -+ ]])], -+ octave_cv_qvariant_canconvert_accepts_qmetatype_type=yes, -+ octave_cv_qvariant_canconvert_accepts_qmetatype_type=no) -+ CPPFLAGS="$ac_octave_save_CPPFLAGS" -+ CXXFLAGS="$ac_octave_save_CXXFLAGS" -+ AC_LANG_POP(C++) -+ ]) -+ if test $octave_cv_qvariant_canconvert_accepts_qmetatype_type = yes; then -+ AC_DEFINE(QVARIANT_CANCONVERT_ACCEPTS_QMETATYPE_TYPE, 1, -+ [Define to 1 if `QVariant::canConvert' accepts `QMetaType::Type' enumeration value as argument.]) -+ fi -+]) -+dnl - dnl Check for the Qhull version. - dnl - AC_DEFUN([OCTAVE_CHECK_QHULL_VERSION], [ -@@ -2518,6 +2578,7 @@ - ## version that we are testing now will be the one used. - - OCTAVE_CHECK_FUNC_QCOMBOBOX_SETCURRENTTEXT -+ OCTAVE_CHECK_FUNC_QFONTDATABASE_SYSTEMFONT - OCTAVE_CHECK_FUNC_QFONTMETRICS_HORIZONTAL_ADVANCE - OCTAVE_CHECK_FUNC_QGUIAPPLICATION_SETDESKTOPFILENAME - OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONRESIZEMODE -@@ -2539,6 +2600,7 @@ - OCTAVE_CHECK_FUNC_QWHEELEVENT_POSITION - OCTAVE_CHECK_MEMBER_QFONT_FORCE_INTEGER_METRICS - OCTAVE_CHECK_MEMBER_QFONT_MONOSPACE -+ OCTAVE_CHECK_QVARIANT_CANCONVERT_ACCEPTS_QMETATYPE_TYPE - OCTAVE_HAVE_QGUIAPPLICATION - - OCTAVE_CHECK_QREGION_ITERATORS - diff --git a/academic/octave/patches/87ca5976c648.diff b/academic/octave/patches/87ca5976c648.diff deleted file mode 100644 index b428490abf..0000000000 --- a/academic/octave/patches/87ca5976c648.diff +++ /dev/null @@ -1,22 +0,0 @@ - -# HG changeset patch -# User Markus Mützel <markus.muetzel@gmx.de> -# Date 1609670947 -3600 -# Node ID 87ca5976c648cc01904f8ef53b576bfb5c8d48fd -# Parent 216ef81dafb682ba0a4a30dcc5c3bc054acb0d60 -build: Use SPARSE_XCPPFLAGS in CPP_FLAGS for libcorefcn (bug #59806). - -* libinterp/corefcn/module.mk: Use SPARSE_XCPPFLAGS in CPP_FLAGS. - -diff --git a/libinterp/corefcn/module.mk b/libinterp/corefcn/module.mk ---- a/libinterp/corefcn/module.mk -+++ b/libinterp/corefcn/module.mk -@@ -325,6 +325,7 @@ - $(FT2_CPPFLAGS) \ - $(HDF5_CPPFLAGS) \ - $(LLVM_CPPFLAGS) \ -+ $(SPARSE_XCPPFLAGS) \ - $(Z_CPPFLAGS) - - libinterp_EXTRA_DIST += \ - diff --git a/academic/pari/pari.SlackBuild b/academic/pari/pari.SlackBuild index 09d2450383..536e7dd0d4 100644 --- a/academic/pari/pari.SlackBuild +++ b/academic/pari/pari.SlackBuild @@ -31,7 +31,7 @@ # Joachim Kruth -> update to version 2.11.2 PRGNAM=pari -VERSION=${VERSION:-2.11.2} +VERSION=${VERSION:-2.13.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -94,8 +94,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr 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/man/man1 +mv $PKG/usr/man/*gz $PKG/usr/man/man1 + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING CHANGES* INSTALL* NEW README* \ +cp -a AUTHORS COPYING CHANGES* NEW README* \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/academic/pari/pari.info b/academic/pari/pari.info index 4dab289fe4..1da54f9b76 100644 --- a/academic/pari/pari.info +++ b/academic/pari/pari.info @@ -1,8 +1,8 @@ PRGNAM="pari" -VERSION="2.11.2" +VERSION="2.13.1" HOMEPAGE="https://pari.math.u-bordeaux.fr/" -DOWNLOAD="https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.11.2.tar.gz" -MD5SUM="6afe748a472c33ae8787a5034d7742a9" +DOWNLOAD="https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.13.1.tar.gz" +MD5SUM="826064cf75af268be8a482ade6e27501" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/academic/sundials/sundials.info b/academic/sundials/sundials.info index f6911f8ed5..561c6831af 100644 --- a/academic/sundials/sundials.info +++ b/academic/sundials/sundials.info @@ -1,7 +1,7 @@ PRGNAM="sundials" VERSION="5.6.1" HOMEPAGE="https://computation.llnl.gov/projects/sundials" -DOWNLOAD="https://computing.llnl.gov/projects/sundials/download/sundials-5.6.1.tar.gz" +DOWNLOAD="https://github.com/LLNL/sundials/releases/download/v5.6.1/sundials-5.6.1.tar.gz" MD5SUM="a945bf3fa606fb6676ec025723688f15" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/audio/mixxx/mixxx.info b/audio/mixxx/mixxx.info index 4d9d06a3df..3f45810e8b 100644 --- a/audio/mixxx/mixxx.info +++ b/audio/mixxx/mixxx.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/mixxxdj/mixxx/archive/release-2.2.4/mixxx-release-2 MD5SUM="25bbebca0187254db4d1c53dc0bdd77d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="chromaprint faad2 libmodplug libmp4v2 libshout lilv opencore-amr opusfile portaudio portmidi protobuf qt5 rubberband speex vamp-plugin-sdk" +REQUIRES="chromaprint faad2 libmodplug libmp4v2 libshout lilv opencore-amr opusfile portaudio portmidi protobuf3 qt5 rubberband speex vamp-plugin-sdk" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/audio/nas/README b/audio/nas/README index 4bf7d8cbf0..8fe2275e3d 100644 --- a/audio/nas/README +++ b/audio/nas/README @@ -2,7 +2,7 @@ The Network Audio System is a network transparent, client/server audio transport system. It can be described as the audio equivalent of an X server. -Note that some applications will likely need recompiling for nas +Note that some applications will likely need recompiling for nas support - mplayer for one. See the /etc/nas/nasd.conf.eg for an example config. diff --git a/audio/nas/nas.SlackBuild b/audio/nas/nas.SlackBuild index 1c99a3f482..f4f0e1ef4a 100644 --- a/audio/nas/nas.SlackBuild +++ b/audio/nas/nas.SlackBuild @@ -82,7 +82,8 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux cd .. -make CFLAGS="$SLKCFLAGS" World +# Multiple jobs fails +make -j1 World make install.man install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/desktop/dmenu2/README b/desktop/dmenu2/README deleted file mode 100644 index 30bf059666..0000000000 --- a/desktop/dmenu2/README +++ /dev/null @@ -1,12 +0,0 @@ -dmenu2 (dynamic menu extended) - -dmenu2 is a fork of the original dmenu - an efficient dynamic menu for -X patched with XFT, quiet, x & y, token, fuzzy matching, follow focus, -tab nav, filter. - -Added option to set screen on which dmenu appears, as well as opacity, -window class and window name. Also allows to dim screen with selected -color and opacity while dmenu2 is running. Added underline color and -height. (options -uc and -uh) - -NOTE: This package conflicts with the original dmenu package. diff --git a/desktop/dmenu2/dmenu2-0.2-config-fix.diff b/desktop/dmenu2/dmenu2-0.2-config-fix.diff deleted file mode 100644 index dd4316a847..0000000000 --- a/desktop/dmenu2/dmenu2-0.2-config-fix.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- config.mk 2014-09-13 18:36:13.478755045 +0300 -+++ a/config.mk 2014-09-13 18:36:18.552755303 +0300 -@@ -1,9 +1,10 @@ - # dmenu2 version --VERSION = 0.1 -+VERSION = 0.2 - - # paths - PREFIX = /usr/local - MANPREFIX = ${PREFIX}/share/man -+LIBDIR = /usr/local/lib - - X11INC = /usr/X11R6/include - X11LIB = /usr/X11R6/lib -@@ -18,12 +19,13 @@ - - # includes and libs - INCS = -I${X11INC} ${XFTINC} --LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${XFTLIBS} -+LIBS = -L${LIBDIR} -L${X11LIB} -lX11 ${XINERAMALIBS} ${XFTLIBS} - - # flags -+OPTS ?= 0s - CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} - #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} --CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} -+CFLAGS = -std=c99 -pedantic -Wall ${OPTS} ${INCS} ${CPPFLAGS} - LDFLAGS = -s ${LIBS} - - # compiler and linker diff --git a/desktop/dmenu2/dmenu2.info b/desktop/dmenu2/dmenu2.info deleted file mode 100644 index 243f34cbe6..0000000000 --- a/desktop/dmenu2/dmenu2.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="dmenu2" -VERSION="0.2" -HOMEPAGE="https://bitbucket.org/melek/dmenu2" -DOWNLOAD="https://bitbucket.org/melek/dmenu2/downloads/dmenu2-0.2.tar.gz" -MD5SUM="bc694c8b9fa3b8f6e7be8046d46e5bc5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Симон Болоканов" -EMAIL="sbolokanov@abv.bg" diff --git a/desktop/dmenu2/slack-desc b/desktop/dmenu2/slack-desc deleted file mode 100644 index aedbfafd4d..0000000000 --- a/desktop/dmenu2/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# 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------------------------------------------------------| -dmenu2: dmenu2 (dynamic menu extended) -dmenu2: -dmenu2: dmenu2 is a fork of original dmenu - an efficient dynamic menu -dmenu2: for X, patched with XFT, quiet, x & y, token, fuzzy matching, follow -dmenu2: focus, tab nav, filter. Added option to set screen on which dmenu -dmenu2: appears, as well as opacity, window class and window name. -dmenu2: Also allows to dim screen with selected color and opacity while -dmenu2: dmenu2 is running. Added underline color and height. -dmenu2: -dmenu2: Homepage: https://bitbucket.org/melek/dmenu2 -dmenu2: diff --git a/desktop/lxpanel/fix_battery_alarm.patch b/desktop/lxpanel/fix_battery_alarm.patch deleted file mode 100644 index 2753619444..0000000000 --- a/desktop/lxpanel/fix_battery_alarm.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 19936f24c343437447ef7e765113fc4679df07eb Mon Sep 17 00:00:00 2001 -From: Andriy Grytsenko <andrej@rep.kiev.ua> -Date: Wed, 27 Feb 2019 02:49:00 +0200 -Subject: [PATCH] fix battery alarm when measurement of current is missing. - -See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854643 ---- - ChangeLog | 4 ++++ - plugins/batt/batt.c | 3 ++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index c0861de..0d610c8 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,7 @@ -+0.10.1 -+------------------------------------------------------------------------- -+* Fixed battery alarm when measurement of current is missing. -+ - 0.10.0 - ------------------------------------------------------------------------- - * Fixed delayed application of font cnahges on dclock and weather plugins. -diff --git a/plugins/batt/batt.c b/plugins/batt/batt.c -index f47549c..cc7bfea 100644 ---- a/plugins/batt/batt.c -+++ b/plugins/batt/batt.c -@@ -111,6 +111,7 @@ static void * alarmProcess(void *arg) { - sem_wait(a->lock); - if (system(a->command) != 0) - g_warning("plugin batt: failed to execute alarm command \"%s\"", a->command); -+ sleep(51); /* do not spam messages more often than once a minute */ - sem_post(a->lock); - - g_free(a); -@@ -257,7 +258,7 @@ void update_display(lx_battery *lx_b, gboolean repaint) { - isCharging = battery_is_charging ( b ); - - /* Consider running the alarm command */ -- if ( !isCharging && rate > 0 && -+ if ( !isCharging && - ( ( battery_get_remaining( b ) / 60 ) < (int)lx_b->alarmTime ) ) - { - /* FIXME: this should be done using glibs process functions */ --- -2.1.4 - diff --git a/desktop/lxpanel/lxpanel.SlackBuild b/desktop/lxpanel/lxpanel.SlackBuild index cce093b1e7..edbbc89a7e 100644 --- a/desktop/lxpanel/lxpanel.SlackBuild +++ b/desktop/lxpanel/lxpanel.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for lxpanel # (C) 2008 Michael Wagner <lapinours@web.de> -# Copyright 2011-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2011-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ # Modified by Matteo Bernardini <ponce@slackbuilds.org> PRGNAM=lxpanel -VERSION=${VERSION:-0.10.0} +VERSION=${VERSION:-0.10.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -74,8 +74,6 @@ 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 {} \; -patch -p1 < $CWD/fix_battery_alarm.patch - sh autogen.sh || true CFLAGS="$SLKCFLAGS" \ diff --git a/desktop/lxpanel/lxpanel.info b/desktop/lxpanel/lxpanel.info index be31b8a229..acb7f1aa94 100644 --- a/desktop/lxpanel/lxpanel.info +++ b/desktop/lxpanel/lxpanel.info @@ -1,8 +1,8 @@ PRGNAM="lxpanel" -VERSION="0.10.0" +VERSION="0.10.1" HOMEPAGE="https://wiki.lxde.org/en/LXPanel" -DOWNLOAD="https://downloads.sf.net/lxde/lxpanel-0.10.0.tar.xz" -MD5SUM="e6a1f9bd5cf39812e1c5d2453a34a7c5" +DOWNLOAD="https://downloads.sf.net/lxde/lxpanel-0.10.1.tar.xz" +MD5SUM="c922d044789c3d7ae028f0e80dea18b0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libfm" diff --git a/desktop/screenkey/screenkey.SlackBuild b/desktop/screenkey/screenkey.SlackBuild index 1e58348e6a..59c132c8e0 100644 --- a/desktop/screenkey/screenkey.SlackBuild +++ b/desktop/screenkey/screenkey.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for screenkey -# Copyright 2013-2019 Benjamin Trigona-Harany +# Copyright 2013-2021 Benjamin Trigona-Harany # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=screenkey -VERSION=${VERSION:-0.9} +VERSION=${VERSION:-1.4} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} @@ -69,14 +69,14 @@ 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 {} \; -python setup.py install --root=$PKG +python3 setup.py install --root=$PKG install -D -m 0644 data/$PRGNAM.desktop \ $PKG/usr/share/applications/$PRGNAM.desktop mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - COPYING.txt NEWS.rst README.rst \ + README.rst \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/desktop/screenkey/screenkey.info b/desktop/screenkey/screenkey.info index 13aa436c68..b2e68c86aa 100644 --- a/desktop/screenkey/screenkey.info +++ b/desktop/screenkey/screenkey.info @@ -1,10 +1,10 @@ PRGNAM="screenkey" -VERSION="0.9" +VERSION="1.4" HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/" -DOWNLOAD="https://www.thregr.org/~wavexx/software/screenkey/releases/screenkey-0.9.tar.gz" -MD5SUM="14b194d2b3c937ae6bc905dea69f3502" +DOWNLOAD="https://www.thregr.org/~wavexx/software/screenkey/releases/screenkey-1.4.tar.gz" +D5SUM="14b1.4d2b3c937ae6bc905dea69f3502" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="FontAwesome setuptools-git python-distutils-extra slop" +REQUIRES="FontAwesome setuptools-git pygobject3-python3 python3-babel slop" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net" diff --git a/desktop/xss-lock/README b/desktop/xss-lock/README new file mode 100644 index 0000000000..5a187fb578 --- /dev/null +++ b/desktop/xss-lock/README @@ -0,0 +1,17 @@ +This is xss-lock, a program for using an external locker as the X +screensaver. + +xss-lock can be run at startup with a favorite screensaving or +screenlocking program: + + xss-lock slock + +xset values for screensaver onset are respected. More details can be +found in the man page. + +xss-lock is a good choice for window manager-only graphical setups. +Desktop environments with native screensaver programs can (and probably +will) interfere with xss-lock. + +Optional dependency: docutils (if not installed, the man page will be +copied in rather than built) diff --git a/desktop/xss-lock/slack-desc b/desktop/xss-lock/slack-desc new file mode 100644 index 0000000000..2ce419405c --- /dev/null +++ b/desktop/xss-lock/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------------------------------------------------------| +xss-lock: xss-lock (using external locker as X screensaver) +xss-lock: +xss-lock: xss-lock hooks up a favorite screen locker to the MIT screen saver +xss-lock: extension for X and to the login manager. +xss-lock: +xss-lock: Although xss-lock conflicts with no Slackware packages, native DE +xss-lock: screensavers may cause runtime interference. +xss-lock: +xss-lock: Author: Raymond Wagenmaker +xss-lock: +xss-lock: https://github.com/xdbob/xss-lock diff --git a/desktop/xss-lock/xss-lock.1 b/desktop/xss-lock/xss-lock.1 new file mode 100644 index 0000000000..6004824c48 --- /dev/null +++ b/desktop/xss-lock/xss-lock.1 @@ -0,0 +1,200 @@ +.\" Man page generated from reStructuredText. +. +.TH "XSS-LOCK" 1 "November 2013" "" "" +.SH NAME +xss-lock \- use external locker as X screen saver +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.SH SYNOPSIS +.nf +xss\-lock [\-n \fInotify_cmd\fP] [\-\-ignore\-sleep] [\-l] [\-v|\-q] [\-\-] \fIlocker\fP [\fIarg\fP] ... +xss\-lock \-\-help|\-\-version +.fi +.sp +.SH DESCRIPTION +.sp +\fBxss\-lock\fP hooks up your favorite locker to the MIT screen saver extension +for X and also to systemd\(aqs login manager. The locker is executed in response +to events from these two sources: +.INDENT 0.0 +.IP \(bu 2 +X signals when screen saver activation is forced or after a period of user +inactivity (as set with \fBxset s TIMEOUT\fP). In the latter case, the notifier +command, if specified, is executed first. +.IP \(bu 2 +The login manager can also request that the session be locked; as a result of +\fBloginctl lock\-sessions\fP, for example. Additionally, \fBxss\-lock\fP uses the +inhibition logic to lock the screen before the system goes to sleep. +.UNINDENT +.sp +\fBxss\-lock\fP waits for the locker to exit \-\- or kills it when screen saver +deactivation or session unlocking is forced \-\- so the command should not fork. +.sp +Also, \fBxss\-lock\fP manages the idle hint on the login session. The idle state +of the session is directly linked to user activity as reported by X (except +when the notifier runs before locking the screen). When all sessions are idle, +the login manager can take action (such as suspending the system) after a +preconfigured delay. +.SH OPTIONS +.INDENT 0.0 +.TP +.BI \-n \ cmd\fR,\fB \ \-\-notifier\fB= cmd +Run \fIcmd\fP when the screen saver activates because of user +inactivity. Shell\-style quoting is supported. The notifier is +killed when X signals user activity or when the locker is +started. The locker is started after the first screen saver +cycle, as set with \fBxset s TIMEOUT CYCLE\fP\&. +.sp +This can be used to run a countdown or (on laptops) dim the +screen before locking. For an example, see the script +\fI/usr/share/doc/xss\-lock/dim\-screen.sh\fP\&. +.TP +.B \-l\fP,\fB \-\-tranfer\-sleep\-lock +Allow the locker process to inherit the file descriptor that +represents the delay lock obtained from the login manager. The +corresponding index will be made available in the environment +variable \fB$XSS_SLEEP_LOCK_FD\fP; this will only be set if the +reason for locking is that the system is preparing to go to +sleep. The locker should close this file descriptor to indicate +it is ready. +.sp +Example scripts that wrap existing lockers are available as +\fI/usr/share/doc/xss\-lock/transfer\-sleep\-lock\-*.sh\fP\&. +.TP +.B \-\-ignore\-sleep +Do not lock on suspend/hibernate. +.TP +.B \-q\fP,\fB \-\-quiet +Output only fatal errors. +.TP +.B \-v\fP,\fB \-\-verbose +Output more messages. +.TP +.B \-h\fP,\fB \-\-help +Print help message and exit. +.TP +.B \-\-version +Print version number and exit. +.UNINDENT +.SH SIGNALS +.INDENT 0.0 +.TP +.B SIGHUP +Upon receiving this signal, \fBxss\-lock\fP resets the screen saver, but only +if the screen is not currently locked (unlike \fBxset s reset\fP). +.sp +This can be used in MPlayer\(aqs configuration as a workaround for MPlayer\(aqs +failure to restart the screen saver timer when playback is paused: +.INDENT 7.0 +.INDENT 3.5 +.sp +.nf +.ft C +heartbeat\-cmd="killall \-HUP xss\-lock" +stop\-xscreensaver=false +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +This is ineffective with mplayer2 (and mpv), because its heart +keeps beating while playback is paused. +.UNINDENT +.UNINDENT +.TP +.B SIGINT/SIGTERM +Upon receiving this signal, \fBxss\-lock\fP exits after killing any running +notifier or locker. +.UNINDENT +.SH NOTES +.INDENT 0.0 +.IP \(bu 2 +Some applications rely on the \fBxdg\-screensaver\fP script from xdg\-utils, +which uses \fBxset s off\fP and \fBxset s default\fP to suspend and resume the +screen saver, respectively. The latter resets the timeout and cycle to the +server defaults (\fBxset s on\fP uses a hardcoded default instead), so this +only works if you are happy with (or can control) the server settings. +.sp +To fix the resume action in this script (or a copy in \fI~/bin\fP preceding the +original in \fB$PATH\fP), either replace \fBon\fP by your preferred timeout and +cycle, or avoid hardcoded time values by patching the script to run a suspend +loop as it does for other screen savers, using +\fI/usr/share/doc/xss\-lock/xdg\-screensaver.patch\fP\&. +.UNINDENT +.SH EXAMPLES +.INDENT 0.0 +.IP \(bu 2 +Run \fBxlock\fP after ten minutes of inactivity: +.INDENT 2.0 +.INDENT 3.5 +.sp +.nf +.ft C +xset 600 +xss\-lock xlock +resetsaver +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +Without \fB+resetsaver\fP, \fBxlock\fP forces a screen saver reset during +startup, thereby telling \fBxss\-lock\fP to immediately kill \fBxlock\fP again. +.IP \(bu 2 +Dim the screen after three minutes of inactivity, lock the screen two minutes +later using \fBi3lock\fP: +.INDENT 2.0 +.INDENT 3.5 +.sp +.nf +.ft C +xset 180 120 +xss\-lock \-n dim\-screen.sh \-\- i3lock \-n +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +\fBNOTE:\fP +.INDENT 2.0 +.INDENT 3.5 +A script is provided to use \fBi3lock\fP\(aqs forking mode with the +\fB\-\-tranfer\-sleep\-lock\fP option (see above). +.UNINDENT +.UNINDENT +.UNINDENT +.SH SEE ALSO +.sp +\fBxset\fP(1), +\fBsystemd\-logind.service\fP(8) +.SH AUTHOR +Raymond Wagenmaker <raymondwagenmaker@gmail.com> +.\" Generated by docutils manpage writer. +. diff --git a/desktop/xss-lock/xss-lock.SlackBuild b/desktop/xss-lock/xss-lock.SlackBuild new file mode 100644 index 0000000000..ef05210aff --- /dev/null +++ b/desktop/xss-lock/xss-lock.SlackBuild @@ -0,0 +1,104 @@ +#!/bin/sh + +# Slackware build script for xss-lock + +# Copyright 2021 K. Eugene Carlson Tsukuba, Japan +# 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. + +PRGNAM=xss-lock +VERSION=${VERSION:-0.3.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +# LIBDIRSUFFIX flag not available +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" +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 {} \; + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_STRIP=/usr/bin/strip \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install/strip DESTDIR=$PKG +cd .. + +# man page will be copied over if docutils is not available. +if [ -d $PKG/usr/share/man ]; then + 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 +else + mkdir -p $PKG/usr/man/man1 + gzip -9 -c $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz +fi + +# Moving and renaming the documentation directory +mkdir -p $PKG/usr/doc +mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION +rm -r $PKG/usr/share/doc +cp -a $CWD/README LICENSE $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +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:-tgz} diff --git a/desktop/xss-lock/xss-lock.info b/desktop/xss-lock/xss-lock.info new file mode 100644 index 0000000000..168d7dfaff --- /dev/null +++ b/desktop/xss-lock/xss-lock.info @@ -0,0 +1,10 @@ +PRGNAM="xss-lock" +VERSION="0.3.0" +HOMEPAGE="https://github.com/xdbob/xss-lock" +DOWNLOAD="https://github.com/xdbob/xss-lock/archive/v0.3.0/xss-lock-0.3.0.tar.gz" +MD5SUM="ebfa58416117a272c2e534036a0deeb4" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="K. Eugene Carlson" +EMAIL="kvngncrlsn@gmail.com" diff --git a/development/Sphinx/Sphinx.SlackBuild b/development/Sphinx/Sphinx.SlackBuild index 4b373717e1..e272e5cb43 100644 --- a/development/Sphinx/Sphinx.SlackBuild +++ b/development/Sphinx/Sphinx.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=Sphinx -VERSION=${VERSION:-3.5.3} +VERSION=${VERSION:-3.5.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/Sphinx/Sphinx.info b/development/Sphinx/Sphinx.info index 9d7d22cbe6..9e04dda7b4 100644 --- a/development/Sphinx/Sphinx.info +++ b/development/Sphinx/Sphinx.info @@ -1,8 +1,8 @@ PRGNAM="Sphinx" -VERSION="3.5.3" +VERSION="3.5.4" HOMEPAGE="http://www.sphinx-doc.org" -DOWNLOAD="https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-3.5.3.tar.gz" -MD5SUM="96fa0862e09763b75da32c8026155c7c" +DOWNLOAD="https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-3.5.4.tar.gz" +MD5SUM="dd46088ebc01f6f721ee7618df680d68" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="alabaster imagesize python3-babel docutils Jinja2 python3-packaging Pygments python-requests python3-six snowballstemmer sphinxcontrib-applehelp sphinxcontrib-devhelp sphinxcontrib-htmlhelp sphinxcontrib-jsmath sphinxcontrib-qthelp sphinxcontrib-serializinghtml python-certifi" diff --git a/development/eovim/07716.patch b/development/eovim/07716.patch deleted file mode 100644 index a591038ac9..0000000000 --- a/development/eovim/07716.patch +++ /dev/null @@ -1,427 +0,0 @@ -From 0771672b18c6645a7fa4de61ac106bdf3b69a04a Mon Sep 17 00:00:00 2001 -From: Jean Guyomarc'h <jean@guyomarch.bzh> -Date: Sat, 12 Jan 2019 08:43:01 +0100 -Subject: [PATCH] nvim: handle requests initiates by neovim - -Neovim is able to initiate requests to the UI client (via the -'rpcrequest()') API. Eovim is now able to run a user-defined callback -function when a request is emitted. A request response is sent back to -neovim. This is one step to solve #38. ---- - CMakeLists.txt | 1 + - include/eovim/nvim.h | 11 +++ - include/eovim/nvim_request.h | 52 ++++++++++++++ - src/main.c | 2 + - src/nvim.c | 72 +++++++++++++++++++- - src/nvim_api.c | 18 ++--- - src/nvim_request.c | 127 +++++++++++++++++++++++++++++++++++ - 7 files changed, 272 insertions(+), 11 deletions(-) - create mode 100644 include/eovim/nvim_request.h - create mode 100644 src/nvim_request.c - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index adf75dc..cfc6dbf 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -115,6 +115,7 @@ add_executable(eovim - "${SRC_DIR}/event/cmdline.c" - "${SRC_DIR}/nvim_api.c" - "${SRC_DIR}/nvim_helper.c" -+ "${SRC_DIR}/nvim_request.c" - "${SRC_DIR}/plugin.c" - "${SRC_DIR}/options.c" - "${SRC_DIR}/contrib.c" -diff --git a/include/eovim/nvim.h b/include/eovim/nvim.h -index 13c77ab..f27e3f4 100644 ---- a/include/eovim/nvim.h -+++ b/include/eovim/nvim.h -@@ -52,6 +52,8 @@ struct nvim - Eina_List *requests; - - msgpack_unpacker unpacker; -+ -+ /* The following msgpack structures must be handled on the main loop only */ - msgpack_sbuffer sbuffer; - msgpack_packer packer; - uint32_t request_id; -@@ -76,4 +78,13 @@ void nvim_mouse_enabled_set(s_nvim *nvim, Eina_Bool enable); - Eina_Bool nvim_mouse_enabled_get(const s_nvim *nvim); - Eina_Stringshare *nvim_eovimrc_path_get(const s_nvim *nvim); - -+/** -+ * Flush the msgpack buffer to the neovim instance, by writing to its standard -+ * input -+ * -+ * @param[in] nvim The neovim handle -+ * @return EINA_TRUE on success, EINA_FALSE on failure. -+ */ -+Eina_Bool nvim_flush(s_nvim *nvim); -+ - #endif /* ! __EOVIM_NVIM_H__ */ -diff --git a/include/eovim/nvim_request.h b/include/eovim/nvim_request.h -new file mode 100644 -index 0000000..68de980 ---- /dev/null -+++ b/include/eovim/nvim_request.h -@@ -0,0 +1,52 @@ -+/* -+ * Copyright (c) 2019 Jean Guyomarc'h -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ */ -+ -+#ifndef EOVIM_NVIM_REQUEST_H__ -+#define EOVIM_NVIM_REQUEST_H__ -+ -+#include "eovim/types.h" -+ -+/** -+ * Callback signature used when replying to a request. -+ * -+ * @param[in] nvim The neovim handle -+ * @param[in] args Array of arguments from the request -+ * @param[in,out] pk Msgpack packer to be used to write the error and the -+ * result of the request. See msgpack-rpc. -+ * @return EINA_TRUE on success, EINA_FALSE on failure -+ * -+ * @note This function should not call nvim_flush(). It is automatically handled. -+ */ -+typedef Eina_Bool (*f_nvim_request_cb)(s_nvim *nvim, const msgpack_object_array *args, -+ msgpack_packer *pk); -+ -+Eina_Bool nvim_request_init(void); -+void nvim_request_shutdown(void); -+ -+Eina_Bool nvim_request_add(const char *request_name, f_nvim_request_cb func); -+void nvim_request_del(const char *request_name); -+ -+Eina_Bool -+nvim_request_process(s_nvim *nvim, Eina_Stringshare *request, -+ const msgpack_object_array *args, uint32_t req_id); -+ -+#endif /* ! EOVIM_NVIM_REQUEST_H__ */ -diff --git a/src/main.c b/src/main.c -index 2708186..4beb699 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -24,6 +24,7 @@ - #include "eovim/config.h" - #include "eovim/nvim.h" - #include "eovim/nvim_api.h" -+#include "eovim/nvim_request.h" - #include "eovim/nvim_event.h" - #include "eovim/termview.h" - #include "eovim/main.h" -@@ -53,6 +54,7 @@ static const s_module _modules[] = - MODULE(config), - MODULE(keymap), - MODULE(nvim_api), -+ MODULE(nvim_request), - MODULE(nvim_event), - MODULE(plugin), - MODULE(prefs), -diff --git a/src/nvim.c b/src/nvim.c -index 6c9d18f..83fdee4 100644 ---- a/src/nvim.c -+++ b/src/nvim.c -@@ -26,6 +26,7 @@ - #include "eovim/config.h" - #include "eovim/nvim_api.h" - #include "eovim/nvim_event.h" -+#include "eovim/nvim_request.h" - #include "eovim/nvim_helper.h" - #include "eovim/log.h" - #include "eovim/main.h" -@@ -53,6 +54,51 @@ _nvim_get(void) - return _nvim_instance; - } - -+static Eina_Bool -+_handle_request(s_nvim *nvim, const msgpack_object_array *args) -+{ -+ /* Retrieve the request identifier ****************************************/ -+ if (EINA_UNLIKELY(args->ptr[1].type != MSGPACK_OBJECT_POSITIVE_INTEGER)) -+ { -+ ERR("Second argument in request is expected to be an integer"); -+ return EINA_FALSE; -+ } -+ const uint64_t long_req_id = args->ptr[1].via.u64; -+ if (EINA_UNLIKELY(long_req_id > UINT32_MAX)) -+ { -+ ERR("Request ID '%" PRIu64 " is too big", long_req_id); -+ return EINA_FALSE; -+ } -+ const uint32_t req_id = (uint32_t)long_req_id; -+ -+ /* Retrieve the request arguments *****************************************/ -+ if (EINA_UNLIKELY(args->ptr[3].type != MSGPACK_OBJECT_ARRAY)) -+ { -+ ERR("Fourth argument in request is expected to be an array"); -+ return EINA_FALSE; -+ } -+ const msgpack_object_array *const req_args = &(args->ptr[3].via.array); -+ -+ /* Retrieve the request name **********************************************/ -+ if (EINA_UNLIKELY(args->ptr[2].type != MSGPACK_OBJECT_STR)) -+ { -+ ERR("Third argument in request is expected to be a string"); -+ return EINA_FALSE; -+ } -+ const msgpack_object_str *const str = &(args->ptr[2].via.str); -+ Eina_Stringshare *const request = -+ eina_stringshare_add_length(str->ptr, str->size); -+ if (EINA_UNLIKELY(! request)) -+ { -+ ERR("Failed to create stringshare"); -+ return EINA_FALSE; -+ } -+ -+ const Eina_Bool ok = nvim_request_process(nvim, request, req_args, req_id); -+ eina_stringshare_del(request); -+ return ok; -+} -+ - static Eina_Bool - _handle_request_response(s_nvim *nvim, - const msgpack_object_array *args) -@@ -289,6 +335,7 @@ _nvim_received_data_cb(void *data EINA_UNUSED, - int type EINA_UNUSED, - void *event) - { -+ /* See https://github.com/msgpack-rpc/msgpack-rpc/blob/master/spec.md */ - const Ecore_Exe_Event_Data *const info = event; - s_nvim *const nvim = _nvim_get(); - msgpack_unpacker *const unpacker = &nvim->unpacker; -@@ -356,11 +403,15 @@ _nvim_received_data_cb(void *data EINA_UNUSED, - } - switch (args->ptr[0].via.u64) - { -- case 1: -+ case 0: /* msgpack-rpc request */ -+ _handle_request(nvim, args); -+ break; -+ -+ case 1: /* msgpack-rpc response */ - _handle_request_response(nvim, args); - break; - -- case 2: -+ case 2: /* msgpack-rpc notification */ - _handle_notification(nvim, args); - break; - -@@ -824,6 +875,23 @@ nvim_free(s_nvim *nvim) - } - } - -+Eina_Bool nvim_flush(s_nvim *nvim) -+{ -+ /* Send the data present in the msgpack buffer */ -+ const Eina_Bool ok = -+ ecore_exe_send(nvim->exe, nvim->sbuffer.data, (int)nvim->sbuffer.size); -+ -+ /* Now that the data is gone (hopefully), clear the buffer */ -+ msgpack_sbuffer_clear(&nvim->sbuffer); -+ if (EINA_UNLIKELY(! ok)) -+ { -+ CRI("Failed to send %zu bytes to neovim", nvim->sbuffer.size); -+ return EINA_FALSE; -+ } -+ DBG("Sent %zu bytes to neovim", nvim->sbuffer.size); -+ return EINA_TRUE; -+} -+ - void - nvim_mouse_enabled_set(s_nvim *nvim, - Eina_Bool enable) -diff --git a/src/nvim_api.c b/src/nvim_api.c -index 0b7e6ee..8082352 100644 ---- a/src/nvim_api.c -+++ b/src/nvim_api.c -@@ -55,8 +55,13 @@ _request_new(s_nvim *nvim, - req->uid = nvim_next_uid_get(nvim); - DBG("Preparing request '%s' with id %"PRIu32, rpc_name, req->uid); - -- /* Clear the serialization buffer before pushing a new request */ -- msgpack_sbuffer_clear(&nvim->sbuffer); -+ /* The buffer MUST be empty before preparing another request. If this is not -+ * the case, something went very wrong! Discard the buffer and keep going */ -+ if (EINA_UNLIKELY(nvim->sbuffer.size != 0u)) -+ { -+ ERR("The buffer is not empty. I've messed up somewhere"); -+ msgpack_sbuffer_clear(&nvim->sbuffer); -+ } - - /* Keep the request around */ - nvim->requests = eina_list_append(nvim->requests, req); -@@ -91,19 +96,14 @@ _request_cleanup(s_nvim *nvim, - } - - static Eina_Bool --_request_send(s_nvim *nvim, -- s_request *req) -+_request_send(s_nvim *nvim, s_request *req) - { - /* Finally, send that to the slave neovim process */ -- const Eina_Bool ok = -- ecore_exe_send(nvim->exe, nvim->sbuffer.data, (int)nvim->sbuffer.size); -- if (EINA_UNLIKELY(! ok)) -+ if (EINA_UNLIKELY(! nvim_flush(nvim))) - { -- CRI("Failed to send %zu bytes to neovim", nvim->sbuffer.size); - _request_cleanup(nvim, req); - return EINA_FALSE; - } -- DBG("Sent %zu bytes to neovim", nvim->sbuffer.size); - return EINA_TRUE; - } - -diff --git a/src/nvim_request.c b/src/nvim_request.c -new file mode 100644 -index 0000000..7d34602 ---- /dev/null -+++ b/src/nvim_request.c -@@ -0,0 +1,127 @@ -+/* -+ * Copyright (c) 2019 Jean Guyomarc'h -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be included in -+ * all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ */ -+ -+#include "eovim/nvim_request.h" -+#include "eovim/nvim.h" -+#include "eovim/log.h" -+ -+static Eina_Hash *_nvim_requests; -+ -+ -+/*============================================================================* -+ * API * -+ *============================================================================*/ -+ -+Eina_Bool -+nvim_request_add(const char *request_name, f_nvim_request_cb func) -+{ -+ Eina_Stringshare *const name = eina_stringshare_add(request_name); -+ const Eina_Bool ok = eina_hash_direct_add(_nvim_requests, name, func); -+ if (EINA_UNLIKELY(! ok)) -+ { -+ ERR("Failed to register request \"%s\"", request_name); -+ return EINA_FALSE; -+ } -+ return EINA_TRUE; -+} -+ -+void -+nvim_request_del(const char *request_name) -+{ -+ Eina_Stringshare *const name = eina_stringshare_add(request_name); -+ eina_hash_del(_nvim_requests, name, NULL); -+ eina_stringshare_del(name); -+} -+ -+Eina_Bool -+nvim_request_init(void) -+{ -+ _nvim_requests = eina_hash_stringshared_new(NULL); -+ if (EINA_UNLIKELY(! _nvim_requests)) -+ { -+ CRI("Failed to create hash table"); -+ return EINA_FALSE; -+ } -+ return EINA_TRUE; -+} -+ -+void -+nvim_request_shutdown(void) -+{ -+ assert(_nvim_requests != NULL); -+ eina_hash_free(_nvim_requests); -+ _nvim_requests = NULL; -+} -+ -+Eina_Bool -+nvim_request_process(s_nvim *nvim, Eina_Stringshare *request, -+ const msgpack_object_array *args, uint32_t req_id) -+{ -+ /* This function shall only be used on the main loop. Otherwise, we cannot -+ * use this packer */ -+ msgpack_packer *const pk = &nvim->packer; -+ -+ /* The buffer MUST be empty before preparing the response. If this is not -+ * the case, something went very wrong! Discard the buffer and keep going */ -+ if (EINA_UNLIKELY(nvim->sbuffer.size != 0u)) -+ { -+ ERR("The buffer is not empty. I've messed up somewhere"); -+ msgpack_sbuffer_clear(&nvim->sbuffer); -+ } -+ -+ /* -+ * Pack the message! It is an array of four (4) items: -+ * - the rpc type: -+ * - 1 is a request response -+ * - the unique identifier of the request -+ * - the error return -+ * - the result return -+ * -+ * We start to reply with the two first elements. If we are not prepared to -+ * handle this request, we will finish the message with an error and no -+ * result. But if someone handles the request, it is up to the handler to -+ * finish the message by setting both the error and result. -+ */ -+ msgpack_pack_array(pk, 4); -+ msgpack_pack_int(pk, 1); -+ msgpack_pack_uint32(pk, req_id); -+ -+ const f_nvim_request_cb func = eina_hash_find(_nvim_requests, request); -+ if (EINA_UNLIKELY(! func)) -+ { -+ WRN("No handler for request '%s'", request); -+ const char error[] = "unknown request"; -+ -+ /* See msgpack-rpc request response. Reply there is an error */ -+ msgpack_pack_str(pk, sizeof(error) - 1u); -+ msgpack_pack_str_body(pk, error, sizeof(error) - 1u); -+ msgpack_pack_nil(pk); -+ nvim_flush(nvim); -+ return EINA_FALSE; -+ } -+ else -+ { -+ const Eina_Bool ok = func(nvim, args, pk); -+ nvim_flush(nvim); -+ return ok; -+ } -+} diff --git a/development/eovim/7b320.patch b/development/eovim/7b320.patch deleted file mode 100644 index a2b31e8c7f..0000000000 --- a/development/eovim/7b320.patch +++ /dev/null @@ -1,182 +0,0 @@ -From 7b320c17b1fc8821eac411f6d6afc14e32f7e093 Mon Sep 17 00:00:00 2001 -From: Jean Guyomarc'h <jean@guyomarch.bzh> -Date: Sat, 12 Jan 2019 08:46:44 +0100 -Subject: [PATCH] nvim: properly handle the vimenter request - -Fixes #38 ---- - include/eovim/nvim_api.h | 3 ++- - include/eovim/nvim_helper.h | 2 +- - src/nvim.c | 47 +++++++++++++++++++++++++++---------- - src/nvim_api.c | 6 +++-- - src/nvim_helper.c | 4 ++-- - 5 files changed, 43 insertions(+), 19 deletions(-) - -diff --git a/include/eovim/nvim_api.h b/include/eovim/nvim_api.h -index 9885ee1..ca9baab 100644 ---- a/include/eovim/nvim_api.h -+++ b/include/eovim/nvim_api.h -@@ -27,7 +27,8 @@ - #include <Eina.h> - #include <msgpack.h> - --Eina_Bool nvim_api_ui_attach(s_nvim *nvim, unsigned int width, unsigned int height); -+Eina_Bool nvim_api_ui_attach(s_nvim *nvim, unsigned int width, unsigned int height, -+ f_nvim_api_cb func, void *func_data); - Eina_Bool nvim_api_get_api_info(s_nvim *nvim, f_nvim_api_cb cb, void *data); - Eina_Bool nvim_api_ui_try_resize(s_nvim *nvim, unsigned int width, unsigned height); - Eina_Bool nvim_api_ui_ext_cmdline_set(s_nvim *nvim, Eina_Bool externalize); -diff --git a/include/eovim/nvim_helper.h b/include/eovim/nvim_helper.h -index b6ce5f4..9f976d5 100644 ---- a/include/eovim/nvim_helper.h -+++ b/include/eovim/nvim_helper.h -@@ -49,6 +49,6 @@ nvim_helper_highlight_group_decode_noop(s_nvim *nvim, - - - void nvim_helper_autocmd_do(s_nvim *nvim, const char *event); --void nvim_helper_autocmd_vimenter_exec(s_nvim *nvim, f_nvim_api_cb func, void *func_data); -+void nvim_helper_autocmd_vimenter_exec(s_nvim *nvim); - - #endif /* ! __EOVIM_NVIM_HELPER_H__ */ -diff --git a/src/nvim.c b/src/nvim.c -index 83fdee4..a003a00 100644 ---- a/src/nvim.c -+++ b/src/nvim.c -@@ -43,6 +43,8 @@ enum - static Ecore_Event_Handler *_event_handlers[__HANDLERS_LAST]; - static s_nvim *_nvim_instance = NULL; - -+static void _api_decode_cb(s_nvim *nvim, void *data, const msgpack_object *result); -+ - /*============================================================================* - * Private API * - *============================================================================*/ -@@ -278,6 +280,15 @@ _handle_notification(s_nvim *nvim, - return EINA_FALSE; - } - -+static Eina_Bool -+_vimenter_request_cb(s_nvim *nvim EINA_UNUSED, -+ const msgpack_object_array *args EINA_UNUSED, -+ msgpack_packer *pk) -+{ -+ msgpack_pack_nil(pk); /* Error */ -+ msgpack_pack_nil(pk); /* Result */ -+ return EINA_TRUE; -+} - - /*============================================================================* - * Nvim Processes Events Handlers * -@@ -298,6 +309,21 @@ _nvim_added_cb(void *data EINA_UNUSED, - - const Ecore_Exe_Event_Add *const info = event; - INF("Process with PID %i was created", ecore_exe_pid_get(info->exe)); -+ -+ /* Okay, at this point the neovim process is running! Great! Now, we can -+ * start to retrieve the API information and trigger the vimenter autocmd. -+ * -+ * We can start attaching the UI on the fly. -+ * See :help ui-startup for details. -+ */ -+ s_nvim *const nvim = _nvim_get(); -+ nvim_api_get_api_info(nvim, _api_decode_cb, NULL); -+ -+ nvim_helper_autocmd_vimenter_exec(nvim); -+ const s_geometry *const geo = &nvim->opts->geometry; -+ nvim_api_ui_attach(nvim, geo->w, geo->h, _ui_attached_cb, NULL); -+ -+ - return ECORE_CALLBACK_PASS_ON; - } - -@@ -438,6 +464,7 @@ _nvim_received_error_cb(void *data EINA_UNUSED, - return ECORE_CALLBACK_PASS_ON; - } - -+/* FIXME this is soooooo fragile */ - static void - _nvim_runtime_load(s_nvim *nvim, - const char *filename) -@@ -653,16 +680,6 @@ _api_decode_cb(s_nvim *nvim, void *data EINA_UNUSED, const msgpack_object *resul - _virtual_interface_setup(nvim); - } - --static void --_vimenter_cb(s_nvim *nvim, -- void *data EINA_UNUSED, -- const msgpack_object *result EINA_UNUSED) --{ -- _nvim_builtin_runtime_load(nvim); -- _nvim_eovimrc_load(nvim); -- nvim_api_var_integer_set(nvim, "eovim_running", 1); --} -- - static void - _nvim_plugins_load(s_nvim *nvim) - { -@@ -815,6 +832,9 @@ nvim_new(const s_options *opts, - /* Initialize the virtual interface to safe values (non-NULL pointers) */ - _virtual_interface_init(nvim); - -+ /* Add a callback to the vimenter request */ -+ nvim_request_add("vimenter", _vimenter_request_cb); -+ - /* Create the neovim process */ - nvim->exe = ecore_exe_pipe_run( - eina_strbuf_string_get(cmdline), -@@ -831,9 +851,10 @@ nvim_new(const s_options *opts, - DBG("Running %s", eina_strbuf_string_get(cmdline)); - eina_strbuf_free(cmdline); - -- nvim_api_get_api_info(nvim, _api_decode_cb, NULL); -- nvim_helper_autocmd_vimenter_exec(nvim, _vimenter_cb, NULL); -- nvim_api_ui_attach(nvim, opts->geometry.w, opts->geometry.h); -+ /* FIXME These are sooo fragile. Rework that!!! */ -+ _nvim_builtin_runtime_load(nvim); -+ _nvim_eovimrc_load(nvim); -+ nvim_api_var_integer_set(nvim, "eovim_running", 1); - - /* Create the GUI window */ - if (EINA_UNLIKELY(! gui_add(&nvim->gui, nvim))) -diff --git a/src/nvim_api.c b/src/nvim_api.c -index 8082352..cf93577 100644 ---- a/src/nvim_api.c -+++ b/src/nvim_api.c -@@ -138,8 +138,8 @@ void nvim_api_request_call(s_nvim *nvim, - - Eina_Bool - nvim_api_ui_attach(s_nvim *nvim, -- unsigned int width, -- unsigned int height) -+ unsigned int width, unsigned int height, -+ f_nvim_api_cb func, void *func_data) - { - const char api[] = "nvim_ui_attach"; - s_request *const req = _request_new(nvim, api, sizeof(api) - 1); -@@ -148,6 +148,8 @@ nvim_api_ui_attach(s_nvim *nvim, - CRI("Failed to create request"); - return EINA_FALSE; - } -+ req->cb.func = func; -+ req->cb.data = func_data; - - const s_config *const cfg = nvim->config; - -diff --git a/src/nvim_helper.c b/src/nvim_helper.c -index 7199203..2ec09fb 100644 ---- a/src/nvim_helper.c -+++ b/src/nvim_helper.c -@@ -134,11 +134,11 @@ nvim_helper_autocmd_do(s_nvim *nvim, - } - - void --nvim_helper_autocmd_vimenter_exec(s_nvim *nvim, f_nvim_api_cb func, void *func_data) -+nvim_helper_autocmd_vimenter_exec(s_nvim *nvim) - { - const char cmd[] = "autocmd VimEnter * call rpcrequest(1, 'vimenter')"; - const Eina_Bool ok = -- nvim_api_command(nvim, cmd, sizeof(cmd) - 1u, func, func_data); -+ nvim_api_command(nvim, cmd, sizeof(cmd) - 1u, NULL, NULL); - if (EINA_UNLIKELY(! ok)) - { ERR("Failed to execute: %s", cmd); } - } diff --git a/development/eovim/dd8f0.patch b/development/eovim/dd8f0.patch deleted file mode 100644 index 9b9722a037..0000000000 --- a/development/eovim/dd8f0.patch +++ /dev/null @@ -1,107 +0,0 @@ -From dd8f0d3fff4951cd7b7ea294823b8e377024c2ff Mon Sep 17 00:00:00 2001 -From: Jean Guyomarc'h <jean@guyomarch.bzh> -Date: Sat, 12 Jan 2019 08:47:35 +0100 -Subject: [PATCH] gui: make an overlay fade when the UI is attached to neovim - ---- - data/themes/default.edc | 29 +++++++++++++++++++++++++++++ - include/eovim/gui.h | 1 + - src/gui.c | 5 +++++ - src/nvim.c | 9 +++++++-- - 4 files changed, 42 insertions(+), 2 deletions(-) - -diff --git a/data/themes/default.edc b/data/themes/default.edc -index 27703fc..7f8d0e3 100644 ---- a/data/themes/default.edc -+++ b/data/themes/default.edc -@@ -430,6 +430,19 @@ collections { - visible: 0; - } - } -+ -+ rect { "overlay"; nomouse; -+ desc { "default"; -+ color: 40 40 40 255;; -+ } -+ desc { "fade"; -+ color: 40 40 40 0; -+ } -+ desc { "faded"; -+ inherit: "fade"; -+ visible: 0; /* Make sure it is killed */ -+ } -+ } - } - - programs { -@@ -437,6 +450,22 @@ collections { - action: PLAY_SAMPLE "bell" 1.0 ALERT; - } - -+ /* [OVERLAY FADING] ************************************************** -+ * When eovim starts, we push an overlay that covers the whole window. -+ * When neovim is successfully attached to the UI, we make the overlay -+ * fade away, so we can begin to use neovim. */ -+ program { signal: "eovim,ready"; source: "eovim"; -+ action: STATE_SET "fade"; -+ target: "overlay"; -+ transition: ACCELERATE 0.2; -+ after: "eovim_overlay_faded"; -+ } -+ program { name: "eovim_overlay_faded"; -+ action: STATE_SET "faded"; -+ target: "overlay"; -+ } -+ /* END OVERLAY FADING ***********************************************/ -+ - program { signal: "eovim,cmdline,show"; source: "eovim"; - action: STATE_SET "default"; - target: "eovim.cmdline"; -diff --git a/include/eovim/gui.h b/include/eovim/gui.h -index f05fb97..981e957 100644 ---- a/include/eovim/gui.h -+++ b/include/eovim/gui.h -@@ -192,6 +192,7 @@ void gui_caps_lock_alert(s_gui *gui); - void gui_caps_lock_dismiss(s_gui *gui); - Eina_Bool gui_caps_lock_warning_get(const s_gui *gui); - -+void gui_ready_set(s_gui *gui); - void gui_mode_update(s_gui *gui, const s_mode *mode); - - #endif /* ! __EOVIM_GUI_H__ */ -diff --git a/src/gui.c b/src/gui.c -index 96dcdcd..efd476b 100644 ---- a/src/gui.c -+++ b/src/gui.c -@@ -893,6 +893,11 @@ gui_bell_ring(s_gui *gui) - elm_layout_signal_emit(gui->layout, "eovim,bell,ring", "eovim"); - } - -+void gui_ready_set(s_gui *gui) -+{ -+ elm_layout_signal_emit(gui->layout, "eovim,ready", "eovim"); -+} -+ - static void - _compl_item_del(void *data, - Evas_Object *obj EINA_UNUSED) -diff --git a/src/nvim.c b/src/nvim.c -index a003a00..dcf263d 100644 ---- a/src/nvim.c -+++ b/src/nvim.c -@@ -49,8 +49,13 @@ static void _api_decode_cb(s_nvim *nvim, void *data, const msgpack_object *resul - * Private API * - *============================================================================*/ - --static inline s_nvim * --_nvim_get(void) -+static void _ui_attached_cb(s_nvim *nvim, void *data EINA_UNUSED, -+ const msgpack_object *result EINA_UNUSED) -+{ -+ gui_ready_set(&nvim->gui); -+} -+ -+static inline s_nvim *_nvim_get(void) - { - /* We handle only one neovim instance */ - return _nvim_instance; diff --git a/development/eovim/eovim.SlackBuild b/development/eovim/eovim.SlackBuild index 3eaaa8b9a6..c14ae7be63 100644 --- a/development/eovim/eovim.SlackBuild +++ b/development/eovim/eovim.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for eovim -# Copyright 2018-2019 Benjamin Trigona-Harany +# Copyright 2018-2021 Benjamin Trigona-Harany # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=eovim -VERSION=${VERSION:-0.1.3} +VERSION=${VERSION:-0.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,9 +69,7 @@ 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 {} \; -patch -p1 < $CWD/7b320.patch -patch -p1 < $CWD/07716.patch -patch -p1 < $CWD/dd8f0.patch +sed -i '25,28d' cmake/Modules/FindEfl.cmake mkdir -p build cd build @@ -79,7 +77,6 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -DLIB_INSTALL_DIR=lib${LIBDIRSUFFIX} \ .. make install DESTDIR=$PKG cd .. diff --git a/development/eovim/eovim.info b/development/eovim/eovim.info index cdaa0982bf..ae1dd04d6b 100644 --- a/development/eovim/eovim.info +++ b/development/eovim/eovim.info @@ -1,8 +1,8 @@ PRGNAM="eovim" -VERSION="0.1.3" +VERSION="0.2.0" HOMEPAGE="https://github.com/jeanguyomarch/eovim" -DOWNLOAD="https://github.com/jeanguyomarch/eovim/archive/v0.1.3/eovim-0.1.3.tar.gz" -MD5SUM="c4f833fa94c483d20d83eb83b48c4c23" +DOWNLOAD="https://github.com/jeanguyomarch/eovim/archive/v0.2.0/eovim-0.2.0.tar.gz" +MD5SUM="9386331be9cbf2bf4910ccb794f47bdf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="efl neovim" diff --git a/development/google-go-lang/google-go-lang.SlackBuild b/development/google-go-lang/google-go-lang.SlackBuild index 2207e81595..1afff977d9 100644 --- a/development/google-go-lang/google-go-lang.SlackBuild +++ b/development/google-go-lang/google-go-lang.SlackBuild @@ -27,7 +27,7 @@ # SOFTWARE. PRGNAM=google-go-lang -VERSION=${VERSION:-1.14.14} +VERSION=${VERSION:-1.16.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -80,12 +80,28 @@ find -L . \ # as of >= go1.5, the cross-compiler does not need to be bootstrap, so the # compiler need only be compiled for the host OS, which it detects unset GOBIN GOPATH GOOS GOARCH -unset BASH_ENV # Not sure why, but this causes run.bash to fail --rworkman -export GOROOT_BOOTSTRAP="/usr" # gcc 5+ is go1.4 API, so we'll bootstrap with it +# Not sure why, but this causes run.bash to fail --rworkman +unset BASH_ENV + +# gcc 5+ is go1.4 API, so we'll bootstrap with it +export GOROOT_BOOTSTRAP="/usr" + +# Default GOROOT is the parent directory of all.bash, +# which is the current directory we're in. +# Defining it here means we can use it below when building +# shared libraries export GOROOT="$(pwd)" + +# The value of GOROOT once the package is installed export GOROOT_FINAL="/usr/lib${LIBDIRSUFFIX}/go${VERSION}/go" +if [ "$ARCH" = "i586" ]; then + export GO386="softfloat" +elif [ "$ARCH" = "i686" ]; then + export GO386="softfloat" +fi + cd src if [ "x${RUN_TEST}" = "xtrue" ] ; then @@ -101,6 +117,14 @@ $GOROOT/bin/go install -buildmode=shared std cd .. +# remove Go build cache +rm -rf pkg/obj/go-build/* + +# remove the doc Makefile +rm -f doc/Makefile + +mkdir -p $PKG$GOROOT_FINAL + # Put the profile scripts for setting PATH and env variables mkdir -p $PKG/etc/profile.d cat > $PKG/etc/profile.d/go.csh << EOF diff --git a/development/google-go-lang/google-go-lang.info b/development/google-go-lang/google-go-lang.info index 9c2c0aa760..a4943b4624 100644 --- a/development/google-go-lang/google-go-lang.info +++ b/development/google-go-lang/google-go-lang.info @@ -1,8 +1,8 @@ PRGNAM="google-go-lang" -VERSION="1.14.14" +VERSION="1.16.3" HOMEPAGE="http://golang.org" -DOWNLOAD="https://storage.googleapis.com/golang/go1.14.14.src.tar.gz" -MD5SUM="d74aae1179bcc61140a7b6648b3959bc" +DOWNLOAD="https://storage.googleapis.com/golang/go1.16.3.src.tar.gz" +MD5SUM="48183a40d6522f1ea59b7d63377b7072" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/jupyter-ipykernel/jupyter-ipykernel.SlackBuild b/development/jupyter-ipykernel/jupyter-ipykernel.SlackBuild index 9ae8008530..cb7927ea7c 100644 --- a/development/jupyter-ipykernel/jupyter-ipykernel.SlackBuild +++ b/development/jupyter-ipykernel/jupyter-ipykernel.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=jupyter-ipykernel -VERSION=${VERSION:-5.3.4} +VERSION=${VERSION:-5.5.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/jupyter-ipykernel/jupyter-ipykernel.info b/development/jupyter-ipykernel/jupyter-ipykernel.info index 2d684badc1..913391ab0d 100644 --- a/development/jupyter-ipykernel/jupyter-ipykernel.info +++ b/development/jupyter-ipykernel/jupyter-ipykernel.info @@ -1,8 +1,8 @@ PRGNAM="jupyter-ipykernel" -VERSION="5.3.4" +VERSION="5.5.3" HOMEPAGE="https://jupyter.org/" -DOWNLOAD="https://files.pythonhosted.org/packages/source/i/ipykernel/ipykernel-5.3.4.tar.gz" -MD5SUM="e4ee1bf2d025a6016fdf03a8f748aa01" +DOWNLOAD="https://files.pythonhosted.org/packages/source/i/ipykernel/ipykernel-5.5.3.tar.gz" +MD5SUM="db9a39b42df83771c168771d95e362b7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-ipython jupyter_client tornado" diff --git a/development/lepton-eda/lepton-eda.SlackBuild b/development/lepton-eda/lepton-eda.SlackBuild index cbe985a6a3..55d389a823 100644 --- a/development/lepton-eda/lepton-eda.SlackBuild +++ b/development/lepton-eda/lepton-eda.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for lepton-eda -# Copyright 2019-2020 dmn <graahnul.grom@gmail.com>, Russia +# Copyright 2019-2021 dmn <graahnul.grom@gmail.com>, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lepton-eda -VERSION=${VERSION:-1.9.13} +VERSION=${VERSION:-1.9.14} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/lepton-eda/lepton-eda.info b/development/lepton-eda/lepton-eda.info index c6450ad728..4a9831f914 100644 --- a/development/lepton-eda/lepton-eda.info +++ b/development/lepton-eda/lepton-eda.info @@ -1,8 +1,8 @@ PRGNAM="lepton-eda" -VERSION="1.9.13" +VERSION="1.9.14" HOMEPAGE="https://github.com/lepton-eda/lepton-eda" -DOWNLOAD="https://github.com/lepton-eda/lepton-eda/releases/download/1.9.13-20201211/lepton-eda-1.9.13.tar.gz" -MD5SUM="fdbebedb1686798e78fc19a498913f8e" +DOWNLOAD="https://github.com/lepton-eda/lepton-eda/releases/download/1.9.14-20210407/lepton-eda-1.9.14.tar.gz" +MD5SUM="a65d71d06dc829c634701c0eaa03dbb3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gtkextra" diff --git a/development/nim/nim.SlackBuild b/development/nim/nim.SlackBuild index 4edc5cd48e..edaf238c7b 100644 --- a/development/nim/nim.SlackBuild +++ b/development/nim/nim.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=nim -VERSION=${VERSION:-1.4.4} +VERSION=${VERSION:-1.4.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/nim/nim.info b/development/nim/nim.info index 5471717456..1ef0efeef1 100644 --- a/development/nim/nim.info +++ b/development/nim/nim.info @@ -1,8 +1,8 @@ PRGNAM="nim" -VERSION="1.4.4" +VERSION="1.4.6" HOMEPAGE="https://nim-lang.org" -DOWNLOAD="https://nim-lang.org/download/nim-1.4.4.tar.xz" -MD5SUM="ffba05f5366aa32a07ec02a7deff4d4e" +DOWNLOAD="https://nim-lang.org/download/nim-1.4.6.tar.xz" +MD5SUM="5bbafd6a3ebd17497886add4e967b028" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/nodejs/nodejs.SlackBuild b/development/nodejs/nodejs.SlackBuild index cd0efa2959..25f6b8c67d 100644 --- a/development/nodejs/nodejs.SlackBuild +++ b/development/nodejs/nodejs.SlackBuild @@ -63,7 +63,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-v$VERSION -tar xvf $CWD/$SRCNAM-v$VERSION.tar.gz +tar xvf $CWD/$SRCNAM-v$VERSION.tar.xz cd $SRCNAM-v$VERSION chown -R root:root . find -L . \ diff --git a/development/postman/postman.SlackBuild b/development/postman/postman.SlackBuild index 4ce0f8243a..99d03c1512 100644 --- a/development/postman/postman.SlackBuild +++ b/development/postman/postman.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=postman SRCDIR=Postman SRCNAM=linux -VERSION=${VERSION:-8.0.10} +VERSION=${VERSION:-8.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/postman/postman.info b/development/postman/postman.info index 12b6df1a24..f2c339dac9 100644 --- a/development/postman/postman.info +++ b/development/postman/postman.info @@ -1,8 +1,8 @@ PRGNAM="postman" -VERSION="8.0.10" +VERSION="8.2.1" HOMEPAGE="https://www.getpostman.com" -DOWNLOAD="https://dl.pstmn.io/download/version/8.0.10/linux64" -MD5SUM="0651da66acc816939b7fc24578394eb6" +DOWNLOAD="https://dl.pstmn.io/download/version/8.2.1/linux64" +MD5SUM="b9b21422cb3004ffa6d72691430e1c78" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/tea/tea.SlackBuild b/development/tea/tea.SlackBuild index 98992f0b6d..66e4126f65 100644 --- a/development/tea/tea.SlackBuild +++ b/development/tea/tea.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=tea -VERSION=${VERSION:-50.1.0} +VERSION=${VERSION:-60.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -91,7 +91,7 @@ cp -f icons/tea_icon_v2.png $PKG/usr/share/pixmaps mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ AUTHORS COPYING ChangeLog \ - manuals/* NEWS README TODO \ + manuals/* NEWS* README* TODO* \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/development/tea/tea.info b/development/tea/tea.info index d6261bf762..f5479a9bc4 100644 --- a/development/tea/tea.info +++ b/development/tea/tea.info @@ -1,8 +1,8 @@ PRGNAM="tea" -VERSION="50.1.0" +VERSION="60.0.3" HOMEPAGE="http://semiletov.org/tea/" -DOWNLOAD="https://github.com/psemiletov/tea-qt/archive/50.1.0/tea-qt-50.1.0.tar.gz" -MD5SUM="a59cbec5ee60c05e44ada9d8ae1fe4fc" +DOWNLOAD="https://github.com/psemiletov/tea-qt/archive/60.0.3/tea-qt-60.0.3.tar.gz" +MD5SUM="661bca198f706a054a9196267b1954dd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/armagetronad/armagetronad.SlackBuild b/games/armagetronad/armagetronad.SlackBuild index 2ad2a6dc2c..e32cd1cf7b 100644 --- a/games/armagetronad/armagetronad.SlackBuild +++ b/games/armagetronad/armagetronad.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2010-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2010-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # based on the hollywoodb's one on 12.2 repository # All rights reserved. # @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=armagetronad -VERSION=${VERSION:-0.2.9.0.1} +VERSION=${VERSION:-0.2.9.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -108,31 +108,29 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild rm -rf $PKG/etc/rc.d -# don't overwrite old configs -CONFIGS="aiplayers.cfg \ - default.cfg \ - settings.cfg \ - settings_authentication.cfg \ - settings_dedicated.cfg \ - settings_visual.cfg" -for config in $CONFIGS ; -do - mv $PKG/etc/$PRGNAM/$config $PKG/etc/$PRGNAM/$config.new ; -done - -# fix .desktop file +# fix .desktop file and icons mkdir $PKG/usr/share/applications -mv $PKG/usr/share/games/$PRGNAM/desktop/$PRGNAM.desktop $PKG/usr/share/applications -install -D -m 0644 $PKG/usr/share/games/armagetronad/desktop/icons/large/armagetronad.png \ - $PKG/usr/share/pixmaps/armagetronad.png +install -D -m 0644 desktop/$PRGNAM.desktop \ + $PKG/usr/share/applications/$PRGNAM.desktop +install -D -m 0644 desktop/icons/48x48/$PRGNAM.png \ + $PKG/usr/share/pixmaps/$PRGNAM.png +for i in 16 32 48 ; do + install -D -m 0644 desktop/icons/${i}x${i}/$PRGNAM.png \ + $PKG/usr/share/icons/hicolor/${i}x${i}/apps/ +done mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh +# don't overwrite old configs +for config in aiplayers default settings settings_authentication settings_dedicated settings_visual ; do + mv $PKG/etc/$PRGNAM/$config.cfg $PKG/etc/$PRGNAM/$config.cfg.new + echo "config etc/$PRGNAM/$config.cfg.new" >> $PKG/install/doinst.sh +done cd $PKG /sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/games/armagetronad/armagetronad.info b/games/armagetronad/armagetronad.info index ad5ac82483..5dc8bee167 100644 --- a/games/armagetronad/armagetronad.info +++ b/games/armagetronad/armagetronad.info @@ -1,10 +1,10 @@ PRGNAM="armagetronad" -VERSION="0.2.9.0.1" +VERSION="0.2.9.1.0" HOMEPAGE="http://www.armagetronad.org" -DOWNLOAD="https://gitlab.com/armagetronad/armagetronad/-/archive/v0.2.9.0.1/armagetronad-v0.2.9.0.1.tar.bz2" -MD5SUM="beeb72db9409fac3d9d4175a43a22a7f" +DOWNLOAD="https://gitlab.com/armagetronad/armagetronad/-/archive/v0.2.9.1.0/armagetronad-v0.2.9.1.0.tar.bz2" +MD5SUM="0c55c7ec2996daa2e834342d631e434d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="ftgl protobuf" +REQUIRES="ftgl protobuf3" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/games/armagetronad/doinst.sh b/games/armagetronad/doinst.sh index ad4ad7c914..c21aa1ca2c 100644 --- a/games/armagetronad/doinst.sh +++ b/games/armagetronad/doinst.sh @@ -15,13 +15,3 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi -CONFIGS="aiplayers.cfg \ - default.cfg \ - settings.cfg \ - settings_authentication.cfg \ - settings_dedicated.cfg \ - settings_visual.cfg" -for config in $CONFIGS ; -do - config etc/armagetronad/$config.new ; -done diff --git a/gis/osm2pgsql/osm2pgsql.SlackBuild b/gis/osm2pgsql/osm2pgsql.SlackBuild index 3f3b5d3860..df61f404ea 100644 --- a/gis/osm2pgsql/osm2pgsql.SlackBuild +++ b/gis/osm2pgsql/osm2pgsql.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=osm2pgsql -VERSION=${VERSION:-1.4.1} +VERSION=${VERSION:-1.4.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/gis/osm2pgsql/osm2pgsql.info b/gis/osm2pgsql/osm2pgsql.info index 3c6dbacf2d..28e89137ac 100644 --- a/gis/osm2pgsql/osm2pgsql.info +++ b/gis/osm2pgsql/osm2pgsql.info @@ -1,8 +1,8 @@ PRGNAM="osm2pgsql" -VERSION="1.4.1" +VERSION="1.4.2" HOMEPAGE="https://wiki.openstreetmap.org/wiki/Osm2pgsql" -DOWNLOAD="https://github.com/openstreetmap/osm2pgsql/archive/1.4.1/osm2pgsql-1.4.1.tar.gz" -MD5SUM="71c920f0d280579295642542a8890fc8" +DOWNLOAD="https://github.com/openstreetmap/osm2pgsql/archive/1.4.2/osm2pgsql-1.4.2.tar.gz" +MD5SUM="6c849709fb967d75554be503385e88f6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="luajit postgis" diff --git a/gis/rasterio/rasterio.SlackBuild b/gis/rasterio/rasterio.SlackBuild index 1445b7e047..4e60c382e4 100644 --- a/gis/rasterio/rasterio.SlackBuild +++ b/gis/rasterio/rasterio.SlackBuild @@ -25,7 +25,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=rasterio -VERSION=${VERSION:-1.2.1} +VERSION=${VERSION:-1.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/gis/rasterio/rasterio.info b/gis/rasterio/rasterio.info index 7d926ce061..3071637e3e 100644 --- a/gis/rasterio/rasterio.info +++ b/gis/rasterio/rasterio.info @@ -1,8 +1,8 @@ PRGNAM="rasterio" -VERSION="1.2.1" +VERSION="1.2.2" HOMEPAGE="https://github.com/mapbox/rasterio" -DOWNLOAD="https://github.com/mapbox/rasterio/archive/1.2.1/rasterio-1.2.1.tar.gz" -MD5SUM="18be2d56585696560d73d42de46fb5db" +DOWNLOAD="https://github.com/mapbox/rasterio/archive/1.2.2/rasterio-1.2.2.tar.gz" +MD5SUM="1e5050ea499e828a4d27877bf2cc185c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="affine click-plugins cligj gdal snuggs numpy3 python3-attrs python3-Cython python3-pyparsing" diff --git a/graphics/lilypond/README b/graphics/lilypond/README index 033b3da404..84c8c4cd96 100644 --- a/graphics/lilypond/README +++ b/graphics/lilypond/README @@ -1,10 +1,4 @@ LilyPond is a music typesetter. It produces beautiful sheet music using a description file as input. -To enable documentation (man and info pages), first install dblatex and a -newer version of texi2html than shipped with Slackware, then run the script as - - # ENABLE_DOCS=yes ./lilypond.SlackBuild - -The documentation is disabled by default since SBo's texi2html package -conflicts with Slackware's tetex package. +extractpdfmark is an optional dependency. diff --git a/graphics/lilypond/lilypond.SlackBuild b/graphics/lilypond/lilypond.SlackBuild index 70e31a9fb4..61caa7cd99 100644 --- a/graphics/lilypond/lilypond.SlackBuild +++ b/graphics/lilypond/lilypond.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for lilypond -# Copyright 2012-2020 Kyle Guinn <elyk03@gmail.com> +# Copyright 2012-2021 Kyle Guinn <elyk03@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lilypond -VERSION=${VERSION:-2.18.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.22.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$(uname -m) ;; esac @@ -37,7 +37,7 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PRGNAM-$VERSION OUTPUT=${OUTPUT:-/tmp} DOCS="AUTHORS* COPYING* DEDICATION HACKING INSTALL* LICENSE* NEWS* README* ROADMAP" @@ -45,6 +45,9 @@ DOCS="AUTHORS* COPYING* DEDICATION HACKING INSTALL* LICENSE* NEWS* README* ROADM if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" @@ -70,10 +73,8 @@ chmod -R u+w,go-w,a+rX-st . # Move the vim syntax highlighting files to where vim can find them. sed -i '/^vimdir/s|=.*|= $(datadir)/vim/vimfiles|' config.make.in -# configure searches for naming variants like guile1.8-config but not this: -GUILE_CONFIG=guile-config1.8 \ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +# --with-texgyre-dir is needed until/unless texlive's fonts are available by default: +# `cd /etc/fonts/conf.d && ln -s ../conf.avail/09-texlive.conf` ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -83,8 +84,11 @@ CXXFLAGS="$SLKCFLAGS" \ --infodir=/usr/info \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux \ - --disable-debugging \ - --enable-documentation=${ENABLE_DOCS:-no} + --with-texgyre-dir=/usr/share/texmf-dist/fonts/opentype/public/tex-gyre \ + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + GUILE_FLAVOR=guile-1.8 \ + GUILE=guile1.8 \ make make install DESTDIR=$PKG @@ -92,16 +96,13 @@ make install DESTDIR=$PKG find $PKG -exec file {} + | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -if [ "x${ENABLE_DOCS:-no}" = "xno" ]; then - # These are (or should be) empty. - rmdir $PKG/usr/man/man1 - rmdir $PKG/usr/man -else - find $PKG/usr/man -type f -execdir gzip -9 {} + +find $PKG/usr/man -type f -execdir gzip -9 {} + - rm -f $PKG/usr/info/dir - find $PKG/usr/info -name '*.info*' -type f -execdir gzip -9 {} + -fi +# `make install` prints a reminder to run install-info on lilypond-web.info +# (only this $MAIN_INFO_DOC, not the others), but forgets to install it. +# Until that is fixed, omit running install-info from doinst.sh. +rm -f $PKG/usr/info/dir +find $PKG/usr/info -name '*.info*' -type f -execdir gzip -9 {} + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/graphics/lilypond/lilypond.info b/graphics/lilypond/lilypond.info index b3864d97c9..52aaf1ae73 100644 --- a/graphics/lilypond/lilypond.info +++ b/graphics/lilypond/lilypond.info @@ -1,10 +1,10 @@ PRGNAM="lilypond" -VERSION="2.18.2" -HOMEPAGE="http://www.lilypond.org/" -DOWNLOAD="http://download.linuxaudio.org/lilypond/sources/v2.18/lilypond-2.18.2.tar.gz" -MD5SUM="3c4bcbb708d12644668b32bfe82ebf25" +VERSION="2.22.0" +HOMEPAGE="https://lilypond.org/" +DOWNLOAD="https://lilypond.org/download/sources/v2.22/lilypond-2.22.0.tar.gz" +MD5SUM="4b0d869873b0120bda2e8bd94e1a628a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="fontforge t1utils guile1.8" +REQUIRES="python3 fontforge texlive texi2html dblatex guile1.8" MAINTAINER="Kyle Guinn" EMAIL="elyk03@gmail.com" diff --git a/graphics/vuescan/vuescan.info b/graphics/vuescan/vuescan.info index c26d64315c..83e983e8ff 100644 --- a/graphics/vuescan/vuescan.info +++ b/graphics/vuescan/vuescan.info @@ -2,9 +2,9 @@ PRGNAM="vuescan" VERSION="9.7.52" HOMEPAGE="https://www.hamrick.com" DOWNLOAD="https://www.hamrick.com/files/vuex3297.tgz" -MD5SUM="4df58833a2013eb42a7e664841f91b0a" +MD5SUM="7e9f7469b22142f85f46b262baa9f45f" DOWNLOAD_x86_64="https://www.hamrick.com/files/vuex6497.tgz" -MD5SUM_x86_64="29e6bc2506049c21dbacb21274eed4f7" +MD5SUM_x86_64="f90313b1192930d8ee4145a2a7973684" REQUIRES="" MAINTAINER="Andrew Clemons" EMAIL="andrew.clemons@gmail.com" diff --git a/libraries/blas/blas.SlackBuild b/libraries/blas/blas.SlackBuild index 6b960bd140..b59c576236 100644 --- a/libraries/blas/blas.SlackBuild +++ b/libraries/blas/blas.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for BLAS -# Copyright 2014-2020 Kyle Guinn <elyk03@gmail.com> +# Copyright 2014-2021 Kyle Guinn <elyk03@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=blas SRCNAM=lapack -VERSION=${VERSION:-3.9.0} +VERSION=${VERSION:-3.9.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/blas/blas.info b/libraries/blas/blas.info index b378f85b90..48d83b69d7 100644 --- a/libraries/blas/blas.info +++ b/libraries/blas/blas.info @@ -1,8 +1,8 @@ PRGNAM="blas" -VERSION="3.9.0" +VERSION="3.9.1" HOMEPAGE="https://www.netlib.org/blas/" -DOWNLOAD="https://github.com/Reference-LAPACK/lapack/archive/v3.9.0/lapack-3.9.0.tar.gz" -MD5SUM="0b251e2a8d5f949f99b50dd5e2200ee2" +DOWNLOAD="https://github.com/Reference-LAPACK/lapack/archive/v3.9.1/lapack-3.9.1.tar.gz" +MD5SUM="47ab2d11652045145df37ddbe2a32d71" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/blas/patches/cmake-piecewise.diff b/libraries/blas/patches/cmake-piecewise.diff index b1bdfaec1e..378acc8769 100644 --- a/libraries/blas/patches/cmake-piecewise.diff +++ b/libraries/blas/patches/cmake-piecewise.diff @@ -5,25 +5,25 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt message(STATUS "CBLAS enable") enable_language(C) --set(LAPACK_INSTALL_EXPORT_NAME cblas-targets) +-set(LAPACK_INSTALL_EXPORT_NAME ${CBLASLIB}-targets) - # Create a header file cblas.h for the routines called in my C programs include(FortranCInterface) ## Ensure that the fortran compiler and c compiler specified are compatible -@@ -41,54 +39,8 @@ +@@ -45,54 +43,8 @@ add_subdirectory(examples) endif() -if(NOT BLAS_FOUND) -- set(ALL_TARGETS ${ALL_TARGETS} blas) +- set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB}) -endif() - -# Export cblas targets from the -# install tree, if any. -set(_cblas_config_install_guard_target "") -if(ALL_TARGETS) -- install(EXPORT cblas-targets -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION} +- install(EXPORT ${CBLASLIB}-targets +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION} - COMPONENT Development - ) - # Choose one of the cblas targets to use as a guard for @@ -34,7 +34,7 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt -# Export cblas targets from the build tree, if any. -set(_cblas_config_build_guard_target "") -if(ALL_TARGETS) -- export(TARGETS ${ALL_TARGETS} FILE cblas-targets.cmake) +- export(TARGETS ${ALL_TARGETS} FILE ${CBLASLIB}-targets.cmake) - - # Choose one of the cblas targets to use as a guard - # for cblas-config.cmake to load targets from the build tree. @@ -42,27 +42,27 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt -endif() - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-version.cmake.in -- ${LAPACK_BINARY_DIR}/cblas-config-version.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${CBLASLIB}-config-version.cmake @ONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-build.cmake.in -- ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${CBLASLIB}-config.cmake @ONLY) - - - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}.pc @ONLY) install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc + ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}.pc DESTINATION ${PKG_CONFIG_DIR} ) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-install.cmake.in -- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake @ONLY) +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CBLASLIB}-config.cmake @ONLY) -install(FILES -- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake -- ${LAPACK_BINARY_DIR}/cblas-config-version.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION} +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CBLASLIB}-config.cmake +- ${LAPACK_BINARY_DIR}/${CBLASLIB}-config-version.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION} - ) - --#install(EXPORT cblas-targets --# DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION} +-#install(EXPORT ${CBLASLIB}-targets +-# DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION} -# COMPONENT Development -# ) diff --git a/CBLAS/cmake/cblas-config-build.cmake.in b/CBLAS/cmake/cblas-config-build.cmake.in @@ -76,14 +76,14 @@ deleted file mode 100644 - -# Load lapack targets from the build tree, including lapacke targets. -if(NOT TARGET lapacke) -- include("@LAPACK_BINARY_DIR@/lapack-targets.cmake") +- include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake") -endif() - -# Report cblas header search locations from build tree. -set(CBLAS_INCLUDE_DIRS "@LAPACK_BINARY_DIR@/include") - -# Report cblas libraries. --set(CBLAS_LIBRARIES cblas) +-set(CBLAS_LIBRARIES @CBLASLIB@) diff --git a/CBLAS/cmake/cblas-config-install.cmake.in b/CBLAS/cmake/cblas-config-install.cmake.in deleted file mode 100644 --- a/CBLAS/cmake/cblas-config-install.cmake.in @@ -96,19 +96,19 @@ deleted file mode 100644 -get_filename_component(_CBLAS_PREFIX "${_CBLAS_PREFIX}" PATH) - -# Load the LAPACK package with which we were built. --set(LAPACK_DIR "${_CBLAS_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/lapack-@LAPACK_VERSION@") +-set(LAPACK_DIR "${_CBLAS_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/@LAPACKLIB@-@LAPACK_VERSION@") -find_package(LAPACK NO_MODULE) - -# Load lapacke targets from the install tree. --if(NOT TARGET cblas) -- include(${_CBLAS_SELF_DIR}/cblas-targets.cmake) +-if(NOT TARGET @CBLASLIB@) +- include(${_CBLAS_SELF_DIR}/@CBLASLIB@-targets.cmake) -endif() - -# Report lapacke header search locations. -set(CBLAS_INCLUDE_DIRS ${_CBLAS_PREFIX}/include) - -# Report lapacke libraries. --set(CBLAS_LIBRARIES cblas) +-set(CBLAS_LIBRARIES @CBLASLIB@) - -unset(_CBLAS_PREFIX) -unset(_CBLAS_SELF_DIR) @@ -128,16 +128,16 @@ deleted file mode 100644 diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt --- a/CBLAS/src/CMakeLists.txt +++ b/CBLAS/src/CMakeLists.txt -@@ -120,9 +120,5 @@ - VERSION ${LAPACK_VERSION} - SOVERSION ${LAPACK_MAJOR_VERSION} - ) --target_include_directories(cblas PUBLIC +@@ -123,9 +123,5 @@ + if(HAS_ATTRIBUTE_WEAK_SUPPORT) + target_compile_definitions(${CBLASLIB} PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT) + endif() +-target_include_directories(${CBLASLIB} PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> - $<INSTALL_INTERFACE:include> -) - target_link_libraries(cblas PRIVATE ${BLAS_LIBRARIES}) - lapack_install_library(cblas) + target_link_libraries(${CBLASLIB} PRIVATE ${BLAS_LIBRARIES}) + lapack_install_library(${CBLASLIB}) diff --git a/CMAKE/lapack-config-build.cmake.in b/CMAKE/lapack-config-build.cmake.in deleted file mode 100644 --- a/CMAKE/lapack-config-build.cmake.in @@ -146,7 +146,7 @@ deleted file mode 100644 -# Load lapack targets from the build tree if necessary. -set(_LAPACK_TARGET "@_lapack_config_build_guard_target@") -if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}") -- include("@LAPACK_BINARY_DIR@/lapack-targets.cmake") +- include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake") -endif() -unset(_LAPACK_TARGET) - @@ -168,7 +168,7 @@ deleted file mode 100644 -# Load lapack targets from the install tree if necessary. -set(_LAPACK_TARGET "@_lapack_config_install_guard_target@") -if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}") -- include("${_LAPACK_SELF_DIR}/lapack-targets.cmake") +- include("${_LAPACK_SELF_DIR}/@LAPACKLIB@-targets.cmake") -endif() -unset(_LAPACK_TARGET) - @@ -184,11 +184,11 @@ deleted file mode 100644 diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -112,11 +112,8 @@ +@@ -160,11 +160,8 @@ # -------------------------------------------------- --set(LAPACK_INSTALL_EXPORT_NAME lapack-targets) +-set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKLIB}-targets) - macro(lapack_install_library lib) install(TARGETS ${lib} @@ -196,7 +196,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT RuntimeLibraries -@@ -155,21 +152,6 @@ +@@ -204,21 +201,6 @@ include(CheckLAPACKCompilerFlags) CheckLAPACKCompilerFlags() @@ -204,7 +204,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -# Check second function - -include(CheckTimeFunction) --set(TIME_FUNC NONE ${TIME_FUNC}) +-set(NONE ${TIME_FUNC}) -CHECK_TIME_FUNCTION(NONE TIME_FUNC) -CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC) -CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC) @@ -218,7 +218,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt # deprecated LAPACK and LAPACKE routines option(BUILD_DEPRECATED "Build deprecated routines" OFF) message(STATUS "Build deprecated routines: ${BUILD_DEPRECATED}") -@@ -193,8 +175,9 @@ +@@ -242,8 +224,9 @@ endif() # -------------------------------------------------- @@ -229,7 +229,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt # Check the usage of the user provided BLAS libraries if(BLAS_LIBRARIES) -@@ -205,113 +188,108 @@ +@@ -254,113 +237,108 @@ if(BLAS_FOUND) message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.") else() @@ -250,7 +250,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt - message(STATUS "Using supplied NETLIB BLAS implementation") - add_subdirectory(BLAS) +elseif(BUILD_BLAS) - set(BLAS_LIBRARIES blas) + set(BLAS_LIBRARIES ${BLASLIB}) -else() - set(CMAKE_EXE_LINKER_FLAGS - "${CMAKE_EXE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}" @@ -326,14 +326,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt + find_package(LAPACK) + +elseif(BUILD_LAPACK) - set(LAPACK_LIBRARIES lapack) + set(LAPACK_LIBRARIES ${LAPACKLIB}) + set(LAPACK_FOUND TRUE) + + set(NEED_BLAS TRUE) + + # Check second function + include(CheckTimeFunction) -+ set(TIME_FUNC NONE ${TIME_FUNC}) ++ set(NONE ${TIME_FUNC}) + CHECK_TIME_FUNCTION(NONE TIME_FUNC) + CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC) + CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC) @@ -363,9 +363,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt + add_subdirectory(TESTING) + endif() + -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc @ONLY) + install(FILES -+ ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc ++ ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc + DESTINATION ${PKG_CONFIG_DIR} + COMPONENT Development + ) @@ -393,8 +393,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt add_subdirectory(LAPACKE) endif() -@@ -338,109 +316,12 @@ - _display_cpp_implementation_msg("LAPACK") +@@ -414,111 +392,16 @@ + ExternalProject_Add_StepDependencies(lapackpp build blaspp ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}) endif() -# -------------------------------------------------- @@ -430,23 +430,23 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -# -------------------------------------------------- - -if(NOT BLAS_FOUND) -- set(ALL_TARGETS ${ALL_TARGETS} blas) +- set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB}) -endif() - -if(NOT LATESTLAPACK_FOUND) -- set(ALL_TARGETS ${ALL_TARGETS} lapack) +- set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKLIB}) -endif() - -if(BUILD_TESTING OR LAPACKE_WITH_TMG) -- set(ALL_TARGETS ${ALL_TARGETS} tmglib) +- set(ALL_TARGETS ${ALL_TARGETS} ${TMGLIB}) -endif() - -# Export lapack targets, not including lapacke, from the -# install tree, if any. -set(_lapack_config_install_guard_target "") -if(ALL_TARGETS) -- install(EXPORT lapack-targets -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION} +- install(EXPORT ${LAPACKLIB}-targets +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION} - COMPONENT Development - ) - @@ -457,12 +457,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt - -# Include cblas in targets exported from the build tree. -if(CBLAS) -- set(ALL_TARGETS ${ALL_TARGETS} cblas) +- set(ALL_TARGETS ${ALL_TARGETS} ${CBLASLIB}) -endif() - -# Include lapacke in targets exported from the build tree. -if(LAPACKE) -- set(ALL_TARGETS ${ALL_TARGETS} lapacke) +- set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKELIB}) +# Neither user specified or optimized BLAS libraries can be used +if(NEED_BLAS AND NOT BLAS_FOUND) + message(FATAL_ERROR "--> No BLAS library found. Specify BLAS_LIBRARIES or enable USE_OPTIMIZED_BLAS or BUILD_BLAS.") @@ -471,7 +471,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -# Export lapack and lapacke targets from the build tree, if any. -set(_lapack_config_build_guard_target "") -if(ALL_TARGETS) -- export(TARGETS ${ALL_TARGETS} FILE lapack-targets.cmake) +- export(TARGETS ${ALL_TARGETS} FILE ${LAPACKLIB}-targets.cmake) - - # Choose one of the lapack or lapacke targets to use as a guard - # for lapack-config.cmake to load targets from the build tree. @@ -480,36 +480,37 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt +if(NEED_LAPACK AND NOT LAPACK_FOUND) + message(FATAL_ERROR "--> No LAPACK library found. Specify LAPACK_LIBRARIES or enable USE_OPTIMIZED_LAPACK or BUILD_LAPACK.") endif() -- + -configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in -- ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config.cmake @ONLY) - - --configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY) +-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc @ONLY) - install(FILES -- ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc +- ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc - DESTINATION ${PKG_CONFIG_DIR} - COMPONENT Development - ) - -configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in -- ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/CMakeFiles/${LAPACKLIB}-config.cmake @ONLY) - -include(CMakePackageConfigHelpers) -write_basic_package_version_file( -- ${LAPACK_BINARY_DIR}/lapack-config-version.cmake +- ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config-version.cmake - VERSION ${LAPACK_VERSION} - COMPATIBILITY SameMajorVersion - ) - -install(FILES -- ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake -- ${LAPACK_BINARY_DIR}/lapack-config-version.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION} +- ${LAPACK_BINARY_DIR}/CMakeFiles/${LAPACKLIB}-config.cmake +- ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config-version.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION} - COMPONENT Development - ) -- -\ No newline at end of file + if (LAPACK++) + install( + DIRECTORY "${LAPACK_BINARY_DIR}/lib/" diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt --- a/LAPACKE/CMakeLists.txt +++ b/LAPACKE/CMakeLists.txt @@ -517,7 +518,7 @@ diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt message(STATUS "LAPACKE enable") enable_language(C) --set(LAPACK_INSTALL_EXPORT_NAME lapacke-targets) +-set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKELIB}-targets) - # Create a header file lapacke_mangling.h for the routines called in my C programs include(FortranCInterface) @@ -526,38 +527,38 @@ diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt VERSION ${LAPACK_VERSION} SOVERSION ${LAPACK_MAJOR_VERSION} ) --target_include_directories(lapacke PUBLIC +-target_include_directories(${LAPACKELIB} PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> - $<INSTALL_INTERFACE:include> -) -if(WIN32 AND NOT UNIX) -- target_compile_definitions(lapacke PUBLIC HAVE_LAPACK_CONFIG_H LAPACK_COMPLEX_STRUCTURE) +- target_compile_definitions(${LAPACKELIB} PUBLIC HAVE_LAPACK_CONFIG_H LAPACK_COMPLEX_STRUCTURE) - message(STATUS "Windows BUILD") -endif() if(LAPACKE_WITH_TMG) - target_link_libraries(lapacke PRIVATE tmglib) + target_link_libraries(${LAPACKELIB} PRIVATE ${TMGLIB}) @@ -111,22 +101,3 @@ DESTINATION ${PKG_CONFIG_DIR} COMPONENT Development ) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-version.cmake.in -- ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config-version.cmake @ONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-build.cmake.in -- ${LAPACK_BINARY_DIR}/lapacke-config.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config.cmake @ONLY) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-install.cmake.in -- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake @ONLY) +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LAPACKELIB}-config.cmake @ONLY) -install(FILES -- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake -- ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION} +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LAPACKELIB}-config.cmake +- ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config-version.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKELIB}-${LAPACK_VERSION} - COMPONENT Development - ) - --install(EXPORT lapacke-targets -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION} +-install(EXPORT ${LAPACKELIB}-targets +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKELIB}-${LAPACK_VERSION} - COMPONENT Development - ) diff --git a/LAPACKE/cmake/lapacke-config-build.cmake.in b/LAPACKE/cmake/lapacke-config-build.cmake.in @@ -570,8 +571,8 @@ deleted file mode 100644 -find_package(LAPACK NO_MODULE) - -# Load lapack targets from the build tree, including lapacke targets. --if(NOT TARGET lapacke) -- include("@LAPACK_BINARY_DIR@/lapack-targets.cmake") +-if(NOT TARGET @LAPACKELIB@) +- include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake") -endif() - -# Hint for project building against lapack @@ -581,7 +582,7 @@ deleted file mode 100644 -set(LAPACKE_INCLUDE_DIRS "@LAPACK_BINARY_DIR@/include") - -# Report lapacke libraries. --set(LAPACKE_LIBRARIES lapacke ${LAPACK_LIBRARIES}) +-set(LAPACKE_LIBRARIES @LAPACKELIB@ ${LAPACK_LIBRARIES}) diff --git a/LAPACKE/cmake/lapacke-config-install.cmake.in b/LAPACKE/cmake/lapacke-config-install.cmake.in deleted file mode 100644 --- a/LAPACKE/cmake/lapacke-config-install.cmake.in @@ -594,12 +595,12 @@ deleted file mode 100644 -get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_PREFIX}" PATH) - -# Load the LAPACK package with which we were built. --set(LAPACK_DIR "${_LAPACKE_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/lapack-@LAPACK_VERSION@") +-set(LAPACK_DIR "${_LAPACKE_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/@LAPACK@-@LAPACK_VERSION@") -find_package(LAPACK NO_MODULE) - -# Load lapacke targets from the install tree. --if(NOT TARGET lapacke) -- include(${_LAPACKE_SELF_DIR}/lapacke-targets.cmake) +-if(NOT TARGET @LAPACKELIB@) +- include(${_LAPACKE_SELF_DIR}/@LAPACKELIB@-targets.cmake) -endif() - -# Hint for project building against lapack @@ -609,7 +610,7 @@ deleted file mode 100644 -set(LAPACKE_INCLUDE_DIRS ${_LAPACKE_PREFIX}/include) - -# Report lapacke libraries. --set(LAPACKE_LIBRARIES lapacke ${LAPACK_LIBRARIES}) +-set(LAPACKE_LIBRARIES @LAPACKELIB@ ${LAPACK_LIBRARIES}) - -unset(_LAPACKE_PREFIX) -unset(_LAPACKE_SELF_DIR) diff --git a/libraries/iddawc/iddawc.SlackBuild b/libraries/iddawc/iddawc.SlackBuild index d547bfef09..e5df2f49e7 100644 --- a/libraries/iddawc/iddawc.SlackBuild +++ b/libraries/iddawc/iddawc.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=iddawc -VERSION=${VERSION:-0.9.8} +VERSION=${VERSION:-0.9.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -39,16 +39,16 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -Wno-error=maybe-uninitialized" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -Wno-error=maybe-uninitialized" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -fPIC -Wno-error=maybe-uninitialized" LIBDIRSUFFIX="64" else - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -Wno-error=maybe-uninitialized" LIBDIRSUFFIX="" fi @@ -81,6 +81,11 @@ cd .. 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 +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 + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION DOCS="LICENSE README.md" cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/libraries/iddawc/iddawc.info b/libraries/iddawc/iddawc.info index 8f9a8870b7..8e5e882da7 100644 --- a/libraries/iddawc/iddawc.info +++ b/libraries/iddawc/iddawc.info @@ -1,8 +1,8 @@ PRGNAM="iddawc" -VERSION="0.9.8" +VERSION="0.9.9" HOMEPAGE="https://github.com/babelouest/iddawc" -DOWNLOAD="https://github.com/babelouest/iddawc/archive/v0.9.8/iddawc-0.9.8.tar.gz" -MD5SUM="b3266cd216ade2918c042495249978d3" +DOWNLOAD="https://github.com/babelouest/iddawc/archive/v0.9.9/iddawc-0.9.9.tar.gz" +MD5SUM="74e4c09dcaa21ccfae3ecc69525ad116" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="rhonabwy" diff --git a/libraries/lapack/README b/libraries/lapack/README index 6cbfe89752..25b52b9faa 100644 --- a/libraries/lapack/README +++ b/libraries/lapack/README @@ -2,6 +2,8 @@ LAPACK provides routines for solving systems of simultaneous linear equations, least-squares solutions of linear systems of equations, eigenvalue problems, and singular value problems. +xblas is an optional dependency. + To build a static library in addition to the shared library, pass STATIC=yes to the script. diff --git a/libraries/lapack/lapack.SlackBuild b/libraries/lapack/lapack.SlackBuild index 492a7c8673..6bd93dafd5 100644 --- a/libraries/lapack/lapack.SlackBuild +++ b/libraries/lapack/lapack.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for LAPACK -# Copyright 2014-2020 Kyle Guinn <elyk03@gmail.com> +# Copyright 2014-2021 Kyle Guinn <elyk03@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=lapack SRCNAM=lapack -VERSION=${VERSION:-3.9.0} +VERSION=${VERSION:-3.9.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,6 +69,10 @@ chmod -R u+w,go-w,a+rX-st . # Allow building only the LAPACK component. patch -p1 < $CWD/patches/cmake-piecewise.diff +if pkg-config --exists xblas; then + use_xblas='-DUSE_XBLAS=ON' +fi + # Avoid adding an RPATH entry to the shared lib. It's unnecessary (except for # running the test suite), and it's broken on 64-bit (needs LIBDIRSUFFIX). mkdir -p shared @@ -82,6 +86,7 @@ cd shared -DUSE_OPTIMIZED_BLAS=ON \ -DBUILD_LAPACK=ON \ -DBUILD_DEPRECATED=ON \ + $use_xblas \ -DBUILD_SHARED_LIBS=ON \ -DCMAKE_SKIP_RPATH=YES \ .. @@ -104,6 +109,7 @@ if [ "${STATIC:-no}" != "no" ]; then -DUSE_OPTIMIZED_BLAS=ON \ -DBUILD_LAPACK=ON \ -DBUILD_DEPRECATED=ON \ + $use_xblas \ .. make make install/strip DESTDIR=$PKG @@ -119,7 +125,7 @@ fi # 5. Turn off MAN_LINKS. See below. sed -i \ -e ':a;/\\$/N;s/\\\n//;ta' \ - -e 's/^\(INPUT *=\).*/\1 SRC/' \ + -e 's/^\(INPUT *=\).*/\1 SRC SRC\/DEPRECATED/' \ -e 's/^\(RECURSIVE *=\).*/\1 NO/' \ -e 's/^\(EXCLUDE *=\).*/\1/' \ -e 's/^\(REPEAT_BRIEF *=\).*/\1 NO/' \ diff --git a/libraries/lapack/lapack.info b/libraries/lapack/lapack.info index 3e4930804f..8774fd2558 100644 --- a/libraries/lapack/lapack.info +++ b/libraries/lapack/lapack.info @@ -1,8 +1,8 @@ PRGNAM="lapack" -VERSION="3.9.0" +VERSION="3.9.1" HOMEPAGE="https://www.netlib.org/lapack/" -DOWNLOAD="https://github.com/Reference-LAPACK/lapack/archive/v3.9.0/lapack-3.9.0.tar.gz" -MD5SUM="0b251e2a8d5f949f99b50dd5e2200ee2" +DOWNLOAD="https://github.com/Reference-LAPACK/lapack/archive/v3.9.1/lapack-3.9.1.tar.gz" +MD5SUM="47ab2d11652045145df37ddbe2a32d71" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="blas" diff --git a/libraries/lapack/patches/cmake-piecewise.diff b/libraries/lapack/patches/cmake-piecewise.diff index b1bdfaec1e..378acc8769 100644 --- a/libraries/lapack/patches/cmake-piecewise.diff +++ b/libraries/lapack/patches/cmake-piecewise.diff @@ -5,25 +5,25 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt message(STATUS "CBLAS enable") enable_language(C) --set(LAPACK_INSTALL_EXPORT_NAME cblas-targets) +-set(LAPACK_INSTALL_EXPORT_NAME ${CBLASLIB}-targets) - # Create a header file cblas.h for the routines called in my C programs include(FortranCInterface) ## Ensure that the fortran compiler and c compiler specified are compatible -@@ -41,54 +39,8 @@ +@@ -45,54 +43,8 @@ add_subdirectory(examples) endif() -if(NOT BLAS_FOUND) -- set(ALL_TARGETS ${ALL_TARGETS} blas) +- set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB}) -endif() - -# Export cblas targets from the -# install tree, if any. -set(_cblas_config_install_guard_target "") -if(ALL_TARGETS) -- install(EXPORT cblas-targets -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION} +- install(EXPORT ${CBLASLIB}-targets +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION} - COMPONENT Development - ) - # Choose one of the cblas targets to use as a guard for @@ -34,7 +34,7 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt -# Export cblas targets from the build tree, if any. -set(_cblas_config_build_guard_target "") -if(ALL_TARGETS) -- export(TARGETS ${ALL_TARGETS} FILE cblas-targets.cmake) +- export(TARGETS ${ALL_TARGETS} FILE ${CBLASLIB}-targets.cmake) - - # Choose one of the cblas targets to use as a guard - # for cblas-config.cmake to load targets from the build tree. @@ -42,27 +42,27 @@ diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt -endif() - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-version.cmake.in -- ${LAPACK_BINARY_DIR}/cblas-config-version.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${CBLASLIB}-config-version.cmake @ONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-build.cmake.in -- ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${CBLASLIB}-config.cmake @ONLY) - - - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}.pc @ONLY) install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc + ${CMAKE_CURRENT_BINARY_DIR}/${CBLASLIB}.pc DESTINATION ${PKG_CONFIG_DIR} ) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-install.cmake.in -- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake @ONLY) +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CBLASLIB}-config.cmake @ONLY) -install(FILES -- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake -- ${LAPACK_BINARY_DIR}/cblas-config-version.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION} +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CBLASLIB}-config.cmake +- ${LAPACK_BINARY_DIR}/${CBLASLIB}-config-version.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION} - ) - --#install(EXPORT cblas-targets --# DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION} +-#install(EXPORT ${CBLASLIB}-targets +-# DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CBLASLIB}-${LAPACK_VERSION} -# COMPONENT Development -# ) diff --git a/CBLAS/cmake/cblas-config-build.cmake.in b/CBLAS/cmake/cblas-config-build.cmake.in @@ -76,14 +76,14 @@ deleted file mode 100644 - -# Load lapack targets from the build tree, including lapacke targets. -if(NOT TARGET lapacke) -- include("@LAPACK_BINARY_DIR@/lapack-targets.cmake") +- include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake") -endif() - -# Report cblas header search locations from build tree. -set(CBLAS_INCLUDE_DIRS "@LAPACK_BINARY_DIR@/include") - -# Report cblas libraries. --set(CBLAS_LIBRARIES cblas) +-set(CBLAS_LIBRARIES @CBLASLIB@) diff --git a/CBLAS/cmake/cblas-config-install.cmake.in b/CBLAS/cmake/cblas-config-install.cmake.in deleted file mode 100644 --- a/CBLAS/cmake/cblas-config-install.cmake.in @@ -96,19 +96,19 @@ deleted file mode 100644 -get_filename_component(_CBLAS_PREFIX "${_CBLAS_PREFIX}" PATH) - -# Load the LAPACK package with which we were built. --set(LAPACK_DIR "${_CBLAS_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/lapack-@LAPACK_VERSION@") +-set(LAPACK_DIR "${_CBLAS_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/@LAPACKLIB@-@LAPACK_VERSION@") -find_package(LAPACK NO_MODULE) - -# Load lapacke targets from the install tree. --if(NOT TARGET cblas) -- include(${_CBLAS_SELF_DIR}/cblas-targets.cmake) +-if(NOT TARGET @CBLASLIB@) +- include(${_CBLAS_SELF_DIR}/@CBLASLIB@-targets.cmake) -endif() - -# Report lapacke header search locations. -set(CBLAS_INCLUDE_DIRS ${_CBLAS_PREFIX}/include) - -# Report lapacke libraries. --set(CBLAS_LIBRARIES cblas) +-set(CBLAS_LIBRARIES @CBLASLIB@) - -unset(_CBLAS_PREFIX) -unset(_CBLAS_SELF_DIR) @@ -128,16 +128,16 @@ deleted file mode 100644 diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt --- a/CBLAS/src/CMakeLists.txt +++ b/CBLAS/src/CMakeLists.txt -@@ -120,9 +120,5 @@ - VERSION ${LAPACK_VERSION} - SOVERSION ${LAPACK_MAJOR_VERSION} - ) --target_include_directories(cblas PUBLIC +@@ -123,9 +123,5 @@ + if(HAS_ATTRIBUTE_WEAK_SUPPORT) + target_compile_definitions(${CBLASLIB} PRIVATE HAS_ATTRIBUTE_WEAK_SUPPORT) + endif() +-target_include_directories(${CBLASLIB} PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> - $<INSTALL_INTERFACE:include> -) - target_link_libraries(cblas PRIVATE ${BLAS_LIBRARIES}) - lapack_install_library(cblas) + target_link_libraries(${CBLASLIB} PRIVATE ${BLAS_LIBRARIES}) + lapack_install_library(${CBLASLIB}) diff --git a/CMAKE/lapack-config-build.cmake.in b/CMAKE/lapack-config-build.cmake.in deleted file mode 100644 --- a/CMAKE/lapack-config-build.cmake.in @@ -146,7 +146,7 @@ deleted file mode 100644 -# Load lapack targets from the build tree if necessary. -set(_LAPACK_TARGET "@_lapack_config_build_guard_target@") -if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}") -- include("@LAPACK_BINARY_DIR@/lapack-targets.cmake") +- include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake") -endif() -unset(_LAPACK_TARGET) - @@ -168,7 +168,7 @@ deleted file mode 100644 -# Load lapack targets from the install tree if necessary. -set(_LAPACK_TARGET "@_lapack_config_install_guard_target@") -if(_LAPACK_TARGET AND NOT TARGET "${_LAPACK_TARGET}") -- include("${_LAPACK_SELF_DIR}/lapack-targets.cmake") +- include("${_LAPACK_SELF_DIR}/@LAPACKLIB@-targets.cmake") -endif() -unset(_LAPACK_TARGET) - @@ -184,11 +184,11 @@ deleted file mode 100644 diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -112,11 +112,8 @@ +@@ -160,11 +160,8 @@ # -------------------------------------------------- --set(LAPACK_INSTALL_EXPORT_NAME lapack-targets) +-set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKLIB}-targets) - macro(lapack_install_library lib) install(TARGETS ${lib} @@ -196,7 +196,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT RuntimeLibraries -@@ -155,21 +152,6 @@ +@@ -204,21 +201,6 @@ include(CheckLAPACKCompilerFlags) CheckLAPACKCompilerFlags() @@ -204,7 +204,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -# Check second function - -include(CheckTimeFunction) --set(TIME_FUNC NONE ${TIME_FUNC}) +-set(NONE ${TIME_FUNC}) -CHECK_TIME_FUNCTION(NONE TIME_FUNC) -CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC) -CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC) @@ -218,7 +218,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt # deprecated LAPACK and LAPACKE routines option(BUILD_DEPRECATED "Build deprecated routines" OFF) message(STATUS "Build deprecated routines: ${BUILD_DEPRECATED}") -@@ -193,8 +175,9 @@ +@@ -242,8 +224,9 @@ endif() # -------------------------------------------------- @@ -229,7 +229,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt # Check the usage of the user provided BLAS libraries if(BLAS_LIBRARIES) -@@ -205,113 +188,108 @@ +@@ -254,113 +237,108 @@ if(BLAS_FOUND) message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.") else() @@ -250,7 +250,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt - message(STATUS "Using supplied NETLIB BLAS implementation") - add_subdirectory(BLAS) +elseif(BUILD_BLAS) - set(BLAS_LIBRARIES blas) + set(BLAS_LIBRARIES ${BLASLIB}) -else() - set(CMAKE_EXE_LINKER_FLAGS - "${CMAKE_EXE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}" @@ -326,14 +326,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt + find_package(LAPACK) + +elseif(BUILD_LAPACK) - set(LAPACK_LIBRARIES lapack) + set(LAPACK_LIBRARIES ${LAPACKLIB}) + set(LAPACK_FOUND TRUE) + + set(NEED_BLAS TRUE) + + # Check second function + include(CheckTimeFunction) -+ set(TIME_FUNC NONE ${TIME_FUNC}) ++ set(NONE ${TIME_FUNC}) + CHECK_TIME_FUNCTION(NONE TIME_FUNC) + CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC) + CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC) @@ -363,9 +363,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt + add_subdirectory(TESTING) + endif() + -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc @ONLY) + install(FILES -+ ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc ++ ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc + DESTINATION ${PKG_CONFIG_DIR} + COMPONENT Development + ) @@ -393,8 +393,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt add_subdirectory(LAPACKE) endif() -@@ -338,109 +316,12 @@ - _display_cpp_implementation_msg("LAPACK") +@@ -414,111 +392,16 @@ + ExternalProject_Add_StepDependencies(lapackpp build blaspp ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}) endif() -# -------------------------------------------------- @@ -430,23 +430,23 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -# -------------------------------------------------- - -if(NOT BLAS_FOUND) -- set(ALL_TARGETS ${ALL_TARGETS} blas) +- set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB}) -endif() - -if(NOT LATESTLAPACK_FOUND) -- set(ALL_TARGETS ${ALL_TARGETS} lapack) +- set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKLIB}) -endif() - -if(BUILD_TESTING OR LAPACKE_WITH_TMG) -- set(ALL_TARGETS ${ALL_TARGETS} tmglib) +- set(ALL_TARGETS ${ALL_TARGETS} ${TMGLIB}) -endif() - -# Export lapack targets, not including lapacke, from the -# install tree, if any. -set(_lapack_config_install_guard_target "") -if(ALL_TARGETS) -- install(EXPORT lapack-targets -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION} +- install(EXPORT ${LAPACKLIB}-targets +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION} - COMPONENT Development - ) - @@ -457,12 +457,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt - -# Include cblas in targets exported from the build tree. -if(CBLAS) -- set(ALL_TARGETS ${ALL_TARGETS} cblas) +- set(ALL_TARGETS ${ALL_TARGETS} ${CBLASLIB}) -endif() - -# Include lapacke in targets exported from the build tree. -if(LAPACKE) -- set(ALL_TARGETS ${ALL_TARGETS} lapacke) +- set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKELIB}) +# Neither user specified or optimized BLAS libraries can be used +if(NEED_BLAS AND NOT BLAS_FOUND) + message(FATAL_ERROR "--> No BLAS library found. Specify BLAS_LIBRARIES or enable USE_OPTIMIZED_BLAS or BUILD_BLAS.") @@ -471,7 +471,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -# Export lapack and lapacke targets from the build tree, if any. -set(_lapack_config_build_guard_target "") -if(ALL_TARGETS) -- export(TARGETS ${ALL_TARGETS} FILE lapack-targets.cmake) +- export(TARGETS ${ALL_TARGETS} FILE ${LAPACKLIB}-targets.cmake) - - # Choose one of the lapack or lapacke targets to use as a guard - # for lapack-config.cmake to load targets from the build tree. @@ -480,36 +480,37 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt +if(NEED_LAPACK AND NOT LAPACK_FOUND) + message(FATAL_ERROR "--> No LAPACK library found. Specify LAPACK_LIBRARIES or enable USE_OPTIMIZED_LAPACK or BUILD_LAPACK.") endif() -- + -configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in -- ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config.cmake @ONLY) - - --configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY) +-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc @ONLY) - install(FILES -- ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc +- ${CMAKE_CURRENT_BINARY_DIR}/${LAPACKLIB}.pc - DESTINATION ${PKG_CONFIG_DIR} - COMPONENT Development - ) - -configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in -- ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/CMakeFiles/${LAPACKLIB}-config.cmake @ONLY) - -include(CMakePackageConfigHelpers) -write_basic_package_version_file( -- ${LAPACK_BINARY_DIR}/lapack-config-version.cmake +- ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config-version.cmake - VERSION ${LAPACK_VERSION} - COMPATIBILITY SameMajorVersion - ) - -install(FILES -- ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake -- ${LAPACK_BINARY_DIR}/lapack-config-version.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION} +- ${LAPACK_BINARY_DIR}/CMakeFiles/${LAPACKLIB}-config.cmake +- ${LAPACK_BINARY_DIR}/${LAPACKLIB}-config-version.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION} - COMPONENT Development - ) -- -\ No newline at end of file + if (LAPACK++) + install( + DIRECTORY "${LAPACK_BINARY_DIR}/lib/" diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt --- a/LAPACKE/CMakeLists.txt +++ b/LAPACKE/CMakeLists.txt @@ -517,7 +518,7 @@ diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt message(STATUS "LAPACKE enable") enable_language(C) --set(LAPACK_INSTALL_EXPORT_NAME lapacke-targets) +-set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKELIB}-targets) - # Create a header file lapacke_mangling.h for the routines called in my C programs include(FortranCInterface) @@ -526,38 +527,38 @@ diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt VERSION ${LAPACK_VERSION} SOVERSION ${LAPACK_MAJOR_VERSION} ) --target_include_directories(lapacke PUBLIC +-target_include_directories(${LAPACKELIB} PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> - $<INSTALL_INTERFACE:include> -) -if(WIN32 AND NOT UNIX) -- target_compile_definitions(lapacke PUBLIC HAVE_LAPACK_CONFIG_H LAPACK_COMPLEX_STRUCTURE) +- target_compile_definitions(${LAPACKELIB} PUBLIC HAVE_LAPACK_CONFIG_H LAPACK_COMPLEX_STRUCTURE) - message(STATUS "Windows BUILD") -endif() if(LAPACKE_WITH_TMG) - target_link_libraries(lapacke PRIVATE tmglib) + target_link_libraries(${LAPACKELIB} PRIVATE ${TMGLIB}) @@ -111,22 +101,3 @@ DESTINATION ${PKG_CONFIG_DIR} COMPONENT Development ) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-version.cmake.in -- ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config-version.cmake @ONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-build.cmake.in -- ${LAPACK_BINARY_DIR}/lapacke-config.cmake @ONLY) +- ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config.cmake @ONLY) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-install.cmake.in -- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake @ONLY) +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LAPACKELIB}-config.cmake @ONLY) -install(FILES -- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/lapacke-config.cmake -- ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION} +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LAPACKELIB}-config.cmake +- ${LAPACK_BINARY_DIR}/${LAPACKELIB}-config-version.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKELIB}-${LAPACK_VERSION} - COMPONENT Development - ) - --install(EXPORT lapacke-targets -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION} +-install(EXPORT ${LAPACKELIB}-targets +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKELIB}-${LAPACK_VERSION} - COMPONENT Development - ) diff --git a/LAPACKE/cmake/lapacke-config-build.cmake.in b/LAPACKE/cmake/lapacke-config-build.cmake.in @@ -570,8 +571,8 @@ deleted file mode 100644 -find_package(LAPACK NO_MODULE) - -# Load lapack targets from the build tree, including lapacke targets. --if(NOT TARGET lapacke) -- include("@LAPACK_BINARY_DIR@/lapack-targets.cmake") +-if(NOT TARGET @LAPACKELIB@) +- include("@LAPACK_BINARY_DIR@/@LAPACKLIB@-targets.cmake") -endif() - -# Hint for project building against lapack @@ -581,7 +582,7 @@ deleted file mode 100644 -set(LAPACKE_INCLUDE_DIRS "@LAPACK_BINARY_DIR@/include") - -# Report lapacke libraries. --set(LAPACKE_LIBRARIES lapacke ${LAPACK_LIBRARIES}) +-set(LAPACKE_LIBRARIES @LAPACKELIB@ ${LAPACK_LIBRARIES}) diff --git a/LAPACKE/cmake/lapacke-config-install.cmake.in b/LAPACKE/cmake/lapacke-config-install.cmake.in deleted file mode 100644 --- a/LAPACKE/cmake/lapacke-config-install.cmake.in @@ -594,12 +595,12 @@ deleted file mode 100644 -get_filename_component(_LAPACKE_PREFIX "${_LAPACKE_PREFIX}" PATH) - -# Load the LAPACK package with which we were built. --set(LAPACK_DIR "${_LAPACKE_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/lapack-@LAPACK_VERSION@") +-set(LAPACK_DIR "${_LAPACKE_PREFIX}/@CMAKE_INSTALL_LIBDIR@/cmake/@LAPACK@-@LAPACK_VERSION@") -find_package(LAPACK NO_MODULE) - -# Load lapacke targets from the install tree. --if(NOT TARGET lapacke) -- include(${_LAPACKE_SELF_DIR}/lapacke-targets.cmake) +-if(NOT TARGET @LAPACKELIB@) +- include(${_LAPACKE_SELF_DIR}/@LAPACKELIB@-targets.cmake) -endif() - -# Hint for project building against lapack @@ -609,7 +610,7 @@ deleted file mode 100644 -set(LAPACKE_INCLUDE_DIRS ${_LAPACKE_PREFIX}/include) - -# Report lapacke libraries. --set(LAPACKE_LIBRARIES lapacke ${LAPACK_LIBRARIES}) +-set(LAPACKE_LIBRARIES @LAPACKELIB@ ${LAPACK_LIBRARIES}) - -unset(_LAPACKE_PREFIX) -unset(_LAPACKE_SELF_DIR) diff --git a/libraries/libfm-extra/libfm-extra.SlackBuild b/libraries/libfm-extra/libfm-extra.SlackBuild index 4ef42b2ceb..b651c1e04a 100644 --- a/libraries/libfm-extra/libfm-extra.SlackBuild +++ b/libraries/libfm-extra/libfm-extra.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libfm-extra -# Copyright 2014-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2014-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=libfm-extra SRCNAM=libfm -VERSION=${VERSION:-1.3.1} +VERSION=${VERSION:-1.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/libfm-extra/libfm-extra.info b/libraries/libfm-extra/libfm-extra.info index 1e765af005..1ca4ae995d 100644 --- a/libraries/libfm-extra/libfm-extra.info +++ b/libraries/libfm-extra/libfm-extra.info @@ -1,8 +1,8 @@ PRGNAM="libfm-extra" -VERSION="1.3.1" +VERSION="1.3.2" HOMEPAGE="https://wiki.lxde.org/en/Libfm" -DOWNLOAD="https://downloads.sf.net/pcmanfm/libfm-1.3.1.tar.xz" -MD5SUM="c15ecd2c9317e2c385cd3f046d0b61ba" +DOWNLOAD="https://downloads.sf.net/pcmanfm/libfm-1.3.2.tar.xz" +MD5SUM="c87a0ff41ae77825079b2f785ec0741e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libfm/libfm.SlackBuild b/libraries/libfm/libfm.SlackBuild index 1555253ffb..fcc8e93ea7 100644 --- a/libraries/libfm/libfm.SlackBuild +++ b/libraries/libfm/libfm.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for libfm # Copyright 2010 Chris Abela <chris.abela@maltats.com> -# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libfm -VERSION=${VERSION:-1.3.1} +VERSION=${VERSION:-1.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/libfm/libfm.info b/libraries/libfm/libfm.info index dd5fd90d6b..33d95cb239 100644 --- a/libraries/libfm/libfm.info +++ b/libraries/libfm/libfm.info @@ -1,8 +1,8 @@ PRGNAM="libfm" -VERSION="1.3.1" +VERSION="1.3.2" HOMEPAGE="https://wiki.lxde.org/en/Libfm" -DOWNLOAD="https://downloads.sf.net/pcmanfm/libfm-1.3.1.tar.xz" -MD5SUM="c15ecd2c9317e2c385cd3f046d0b61ba" +DOWNLOAD="https://downloads.sf.net/pcmanfm/libfm-1.3.2.tar.xz" +MD5SUM="c87a0ff41ae77825079b2f785ec0741e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lxmenu-data menu-cache" diff --git a/libraries/libxkbcommon/libxkbcommon.SlackBuild b/libraries/libxkbcommon/libxkbcommon.SlackBuild index ae10fb656d..f9dc0f78c0 100644 --- a/libraries/libxkbcommon/libxkbcommon.SlackBuild +++ b/libraries/libxkbcommon/libxkbcommon.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libxkbcommon -VERSION=${VERSION:-1.2.0} +VERSION=${VERSION:-1.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/libxkbcommon/libxkbcommon.info b/libraries/libxkbcommon/libxkbcommon.info index b2ac875ee6..ee07e75c0b 100644 --- a/libraries/libxkbcommon/libxkbcommon.info +++ b/libraries/libxkbcommon/libxkbcommon.info @@ -1,8 +1,8 @@ PRGNAM="libxkbcommon" -VERSION="1.2.0" +VERSION="1.2.1" HOMEPAGE="https://xkbcommon.org/" -DOWNLOAD="https://xkbcommon.org/download/libxkbcommon-1.2.0.tar.xz" -MD5SUM="e1ed6c326a75ae9f7bb0d08410a381f1" +DOWNLOAD="https://xkbcommon.org/download/libxkbcommon-1.2.1.tar.xz" +MD5SUM="36b2803f3beedd0aeeb265072e9c3e5d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="meson" diff --git a/libraries/libxlsxwriter/README b/libraries/libxlsxwriter/README index 45567e168f..aa0f51b3c0 100644 --- a/libraries/libxlsxwriter/README +++ b/libraries/libxlsxwriter/README @@ -1,8 +1,8 @@ A C library for creating Excel XLSX files -Libxlsxwriter is a C library that can be used to write text, numbers, formulas -and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file. It supports -features such as: +Libxlsxwriter is a C library that can be used to write text, numbers, +formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX +file. It supports features such as: * 100% compatible Excel XLSX files. * Full Excel formatting. @@ -16,7 +16,8 @@ features such as: * Source code available on GitHub. * FreeBSD License. * ANSI C. -* Works with GCC, Clang, Xcode, MSVC 2015, ICC, TCC, MinGW, MingGW-w64/32. +* Works with GCC, Clang, Xcode, MSVC 2015, ICC, TCC, MinGW, + MingGW-w64/32. * Works on Linux, FreeBSD, OpenBSD, OS X, iOS and Windows. Also works on MSYS/MSYS2 and Cygwin. * Compiles for 32 and 64 bit. diff --git a/libraries/libxlsxwriter/libxlsxwriter.SlackBuild b/libraries/libxlsxwriter/libxlsxwriter.SlackBuild index 5ce9ceb6fe..35b69b2920 100644 --- a/libraries/libxlsxwriter/libxlsxwriter.SlackBuild +++ b/libraries/libxlsxwriter/libxlsxwriter.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libxlsxwriter -VERSION=${VERSION:-0.9.4} +VERSION=${VERSION:-1.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -76,6 +76,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=ON \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/libraries/libxlsxwriter/libxlsxwriter.info b/libraries/libxlsxwriter/libxlsxwriter.info index ccad2233ca..9d0ad39936 100644 --- a/libraries/libxlsxwriter/libxlsxwriter.info +++ b/libraries/libxlsxwriter/libxlsxwriter.info @@ -1,8 +1,8 @@ PRGNAM="libxlsxwriter" -VERSION="0.9.4" +VERSION="1.0.2" HOMEPAGE="https://libxlsxwriter.github.io/" -DOWNLOAD="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_0.9.4/libxlsxwriter-RELEASE_0.9.4.tar.gz" -MD5SUM="08c799090ebf04e14d2e62d84a4e9000" +DOWNLOAD="https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_1.0.2/libxlsxwriter-RELEASE_1.0.2.tar.gz" +MD5SUM="82b004c9a3b1b4af8313dfa8ed8ea094" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/rhonabwy/rhonabwy.SlackBuild b/libraries/rhonabwy/rhonabwy.SlackBuild index 51ca0cfe53..0dcb0f0911 100644 --- a/libraries/rhonabwy/rhonabwy.SlackBuild +++ b/libraries/rhonabwy/rhonabwy.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=rhonabwy -VERSION=${VERSION:-0.9.99} +VERSION=${VERSION:-0.9.999} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -39,16 +39,16 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -Wno-error=maybe-uninitialized" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -Wno-error=maybe-uninitialized" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -fPIC -Wno-error=maybe-uninitialized" LIBDIRSUFFIX="64" else - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -Wno-error=maybe-uninitialized" LIBDIRSUFFIX="" fi @@ -82,6 +82,11 @@ cd .. 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 +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 + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION DOCS="LICENSE README.md" cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/libraries/rhonabwy/rhonabwy.info b/libraries/rhonabwy/rhonabwy.info index 26aaab4292..8d9b0fbe19 100644 --- a/libraries/rhonabwy/rhonabwy.info +++ b/libraries/rhonabwy/rhonabwy.info @@ -1,8 +1,8 @@ PRGNAM="rhonabwy" -VERSION="0.9.99" +VERSION="0.9.999" HOMEPAGE="https://github.com/babelouest/rhonabwy" -DOWNLOAD="https://github.com/babelouest/rhonabwy/archive/v0.9.99/rhonabwy-0.9.99.tar.gz" -MD5SUM="46853f67a106a6f7ae98ef98d3244b0a" +DOWNLOAD="https://github.com/babelouest/rhonabwy/archive/v0.9.999/rhonabwy-0.9.999.tar.gz" +MD5SUM="b267fce07eeafc3ed327ecfb5400c93c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jansson libmicrohttpd ulfius" diff --git a/libraries/skalibs/skalibs.SlackBuild b/libraries/skalibs/skalibs.SlackBuild index 9384157e30..ccc17eed73 100644 --- a/libraries/skalibs/skalibs.SlackBuild +++ b/libraries/skalibs/skalibs.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=skalibs -VERSION=${VERSION:-2.10.0.2} +VERSION=${VERSION:-2.10.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/skalibs/skalibs.info b/libraries/skalibs/skalibs.info index acc2c82536..2dd406572f 100644 --- a/libraries/skalibs/skalibs.info +++ b/libraries/skalibs/skalibs.info @@ -1,8 +1,8 @@ PRGNAM="skalibs" -VERSION="2.10.0.2" +VERSION="2.10.0.3" HOMEPAGE="https://skarnet.org/software/skalibs/" -DOWNLOAD="https://skarnet.org/software/skalibs/skalibs-2.10.0.2.tar.gz" -MD5SUM="e7b9f44eb22871d72f70212a67a12db8" +DOWNLOAD="https://skarnet.org/software/skalibs/skalibs-2.10.0.3.tar.gz" +MD5SUM="85ad305218d10fe65b38c4c351faa395" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/xblas/patches/automake.diff b/libraries/xblas/patches/automake.diff index 79522b2cd2..d2484736c2 100644 --- a/libraries/xblas/patches/automake.diff +++ b/libraries/xblas/patches/automake.diff @@ -1,7 +1,7 @@ diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac -@@ -1,10 +1,12 @@ +@@ -1,10 +1,13 @@ dnl Copyright (c) 2005, Regents of the University of California -AC_INIT(xblas, 1.0, extended_blas@cs.berkeley.edu) -AC_PREREQ(2.59) @@ -15,11 +15,12 @@ diff --git a/configure.ac b/configure.ac +AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_TARGET +AM_INIT_AUTOMAKE([foreign subdir-objects]) -+LT_INIT ++AM_SILENT_RULES([yes]) ++LT_INIT([disable-static]) AC_PROG_CC -@@ -148,6 +150,6 @@ +@@ -148,6 +151,6 @@ [$M4 $M4_OPTS Makefile.m4 >Makefile], [M4=$M4; M4_OPTS="$M4_OPTS"]) AC_SUBST(EXTRA_LIBS, $EXTRA_LIBS) diff --git a/libraries/xblas/xblas.SlackBuild b/libraries/xblas/xblas.SlackBuild index edd20a8cfe..1e02069fe5 100644 --- a/libraries/xblas/xblas.SlackBuild +++ b/libraries/xblas/xblas.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for XBLAS -# Copyright 2017 Kyle Guinn <elyk03@gmail.com>, USA +# Copyright 2017-2021 Kyle Guinn <elyk03@gmail.com>, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=xblas VERSION=${VERSION:-1.0.248} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -37,7 +37,7 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PRGNAM-$VERSION OUTPUT=${OUTPUT:-/tmp} DOCS="LICENSE README* doc/report.ps" @@ -65,7 +65,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go-w,a+rX-st . @@ -85,8 +85,6 @@ autoreconf -vif --mandir=/usr/man \ --infodir=/usr/info \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-shared \ - --disable-static \ --disable-dependency-tracking \ --build=$ARCH-slackware-linux \ CFLAGS="$SLKCFLAGS" \ diff --git a/libraries/xblas/xblas.info b/libraries/xblas/xblas.info index 4e975b9b44..8fb3ef025e 100644 --- a/libraries/xblas/xblas.info +++ b/libraries/xblas/xblas.info @@ -1,7 +1,7 @@ PRGNAM="xblas" VERSION="1.0.248" HOMEPAGE="https://www.netlib.org/xblas/" -DOWNLOAD="https://www.netlib.org/xblas/xblas.tar.gz" +DOWNLOAD="https://www.netlib.org/xblas/xblas-1.0.248.tar.gz" MD5SUM="990c680fb5e446bb86c10936e4cd7f88" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/multimedia/gnash/README b/multimedia/gnash/README index 8b184d97eb..139c27d15c 100644 --- a/multimedia/gnash/README +++ b/multimedia/gnash/README @@ -1,9 +1,13 @@ Gnash is the GNU SWF movie player, which can be run standalone on the -desktop or an embedded device, as well as as a plugin for several browsers. +desktop or an embedded device, as well as a plugin for several browsers. -If you don't want to compile it or if you don't have KDE installed, -you can disable the Konqueror plugin ("Klash") like this: - KLASH=no ./gnash.SlackBuild +Plugins are now disabled by default due to browsers removing support. + +To enable the Mozilla NPAPI plugin, install xulrunner, then run + NPAPI=yes ./gnash.SlackBuild + +To enable the KDE4 Konqueror plugin, run + KPARTS4=yes ./gnash.SlackBuild Optional but recommended dependencies are speex, gst0-ffmpeg, and gst0-plugins-ugly. diff --git a/multimedia/gnash/doinst.sh b/multimedia/gnash/doinst.sh index 80505ba966..f33553f39b 100644 --- a/multimedia/gnash/doinst.sh +++ b/multimedia/gnash/doinst.sh @@ -11,9 +11,18 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } +schema_install() { + SCHEMA="$1" + GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \ + chroot . gconftool-2 --makefile-install-rule \ + /etc/gconf/schemas/$SCHEMA \ + 1>/dev/null +} + config etc/gnashpluginrc.new config etc/gnashthumbnailrc.new config etc/gnashrc.new +schema_install gnash.schemas if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 diff --git a/multimedia/gnash/gnash.SlackBuild b/multimedia/gnash/gnash.SlackBuild index 99a4c07c84..6e359cf86e 100644 --- a/multimedia/gnash/gnash.SlackBuild +++ b/multimedia/gnash/gnash.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gnash -# Copyright 2012-2016 Kyle Guinn <elyk03@gmail.com>, USA +# Copyright 2012-2021 Kyle Guinn <elyk03@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gnash -VERSION=${VERSION:-0.8.10} -BUILD=${BUILD:-7} +VERSION=${VERSION:-0.8.11dev_20190130} +SRCVER=${SRCVER:-583ccbc1275c7701dc4843ec12142ff86bb305b4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -37,7 +38,7 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PRGNAM-$VERSION OUTPUT=${OUTPUT:-/tmp} DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO" @@ -59,17 +60,32 @@ else LIBDIRSUFFIX="" fi -# Set $KLASH to "no" to disable Klash, the Konqueror plugin. -if [ "${KLASH:-yes}" = "yes" ]; then - KLASH_OPT="\ - --with-kde4-incl=/usr/include \ - --with-kde4-configdir=/usr/share/config \ +# Set $NPAPI to "yes" to enable the Mozilla plugin. Requires xulrunner. +if [ "${NPAPI:-no}" != "no" ]; then + NPAPI_OPT="--enable-write" # This option no longer does anything? +else + NPAPI_OPT="--disable-npapi" +fi + +# TODO: Test the KPARTS3 plugin with KDE3/Trinity. +if [ "${KPARTS3:-no}" != "no" ]; then + KPARTS3_OPT="" +else + KPARTS3_OPT="--disable-kparts3" +fi + +# Set $KPARTS4 to "yes" to enable the KDE4 Konqueror plugin. +if [ "${KPARTS4:-no}" != "no" ]; then + KPARTS4_OPT=" \ --with-kde4-prefix=/usr \ + --with-kde4-incl=/usr/include \ --with-kde4-lib=/usr/lib${LIBDIRSUFFIX} \ - --with-kde-appsdatadir=/usr/share/apps/klash \ - --with-kde4-servicesdir=/usr/share/kde4/services" + --with-kde4-plugindir=/usr/lib${LIBDIRSUFFIX}/kde4 \ + --with-kde4-servicesdir=/usr/share/kde4/services \ + --with-kde4-configdir=/usr/share/config \ + --with-kde-appsdatadir=/usr/share/apps/klash" else - KLASH_OPT="--disable-kparts3 --disable-kparts4" + KPARTS4_OPT="--disable-kparts4" fi set -e @@ -77,33 +93,12 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$SRCVER +tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz +cd $PRGNAM-$SRCVER chown -R root:root . chmod -R u+w,go-w,a+rX-st . -# Fix compilation with GCC 4.7. -patch -p1 < $CWD/patch/gcc47.patch - -# Fix a boost linking error, paths for kde plugin, and a cve patch. -# Ripped from gentoo -patch -p1 < $CWD/patch/gnash-0.8.10-boost-1.50.patch -patch -p1 < $CWD/patch/gnash-0.8.10-klash.patch -patch -p1 < $CWD/patch/gnash-0.8.10-kde4-libdir.patch -patch -p1 < $CWD/patch/gnash-0.8.10-cve-2012-1175.patch - -# Fix building with giflib-5.0 -# Also ripped from gentoo :-) -patch -p1 < $CWD/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch -patch -p1 < $CWD/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch - -# Fix build with new Boost -# Taken from ARCH -patch -p1 < $CWD/patch/gnash-boost.patch - -# The FFmpeg engine doesn't compile with FFmpeg 0.11.1. Patches welcome. -# In the meantime, set --enable-media=gst to avoid autodetecting FFmpeg. autoreconf -vif ./configure \ --prefix=/usr \ @@ -115,15 +110,14 @@ autoreconf -vif --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux \ --disable-dependency-tracking \ - --enable-media=gst \ --enable-python \ --enable-ssh \ --enable-ssl \ - --enable-write \ --without-gconf \ --with-plugins-install=system \ - --with-speexdsp-incl=/usr/include/speex \ - $KLASH_OPT \ + $NPAPI_OPT \ + $KPARTS3_OPT \ + $KPARTS4_OPT \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -139,6 +133,9 @@ find $PKG/usr/lib${LIBDIRSUFFIX} -name '*.la' -delete find $PKG/etc -type f -exec mv {} {}.new \; find $PKG/usr/man -type f -exec gzip -9 {} + +mkdir -p $PKG/etc/gconf/schemas +mv $PKG/usr/share/applications/gnash.schemas $PKG/etc/gconf/schemas + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/multimedia/gnash/gnash.info b/multimedia/gnash/gnash.info index 012dd88c5f..1d609651ed 100644 --- a/multimedia/gnash/gnash.info +++ b/multimedia/gnash/gnash.info @@ -1,10 +1,10 @@ PRGNAM="gnash" -VERSION="0.8.10" +VERSION="0.8.11dev_20190130" HOMEPAGE="https://www.gnu.org/software/gnash/" -DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/gnash/0.8.10/gnash-0.8.10.tar.bz2" -MD5SUM="63e9f79c41d93d48c5a2fa94856548c4" +DOWNLOAD="https://git.savannah.gnu.org/cgit/gnash.git/snapshot/gnash-583ccbc1275c7701dc4843ec12142ff86bb305b4.tar.gz" +MD5SUM="44dec2747ea79fd6bd68a58dc8512821" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="agg xulrunner" +REQUIRES="agg" MAINTAINER="Kyle Guinn" EMAIL="elyk03@gmail.com" diff --git a/multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch b/multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch deleted file mode 100644 index b3242ce0d3..0000000000 --- a/multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 58dcdd9338d965e54c8f03ce3d2757388d82b7a3 Mon Sep 17 00:00:00 2001 -From: gustavo <gbuschle@hotmail.com> -Date: Thu, 11 Sep 2014 14:12:17 +0000 -Subject: Add support for giflib 5.1 - ---- -diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp -index 84b09ce..2ae5ddb 100644 ---- a/libbase/GnashImageGif.cpp -+++ b/libbase/GnashImageGif.cpp -@@ -120,7 +120,11 @@ GifInput::GifInput(std::shared_ptr<IOChannel> in) - GifInput::~GifInput() - { - // Clean up allocated data. -- DGifCloseFile(_gif); -+#if GIFLIB_MAJOR==5 && GIFLIB_MINOR==1 -+ DGifCloseFile(_gif, 0); -+#else -+ DGifCloseFile(_gif); -+#endif - } - - size_t --- -cgit v0.9.0.2 diff --git a/multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch b/multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch deleted file mode 100644 index 6e90737d51..0000000000 --- a/multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cc22f2d0597f3a9547980f4786d918f8b5635472 Mon Sep 17 00:00:00 2001 -From: OBATA Akio <obata@lins.jp> -Date: Mon, 15 Jul 2013 07:16:39 +0000 -Subject: Add support fir GIFLIB-5.0 (bug #39482) - -Signed-off-by: Sandro Santilli <strk@keybit.net> ---- -diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp -index eeba4b7..26865c1 100644 ---- a/libbase/GnashImageGif.cpp -+++ b/libbase/GnashImageGif.cpp -@@ -269,7 +269,17 @@ GifInput::processRecord(GifRecordType record) - void - GifInput::read() - { -+#if GIFLIB_MAJOR >= 5 -+ int errorCode; -+ _gif = DGifOpen(_inStream.get(), &readData, &errorCode); -+#else - _gif = DGifOpen(_inStream.get(), &readData); -+#endif -+ -+ if ( ! _gif ) { -+ // TODO: decode errorCode if available -+ throw ParserException("Could not open input GIF stream"); -+ } - - GifRecordType record; - --- -cgit v0.9.0.2 diff --git a/multimedia/gnash/patch/gcc47.patch b/multimedia/gnash/patch/gcc47.patch deleted file mode 100644 index 7886b097c9..0000000000 --- a/multimedia/gnash/patch/gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/plugin/klash4/klash_part.cpp b/plugin/klash4/klash_part.cpp ---- a/plugin/klash4/klash_part.cpp -+++ b/plugin/klash4/klash_part.cpp -@@ -27,6 +27,7 @@ - #include <QByteArray> - #include <QMenu> - #include <QTimer> -+#include <unistd.h> - - #include <klibloader.h> - #include <kdebug.h> diff --git a/multimedia/gnash/patch/gnash-0.8.10-boost-1.50.patch b/multimedia/gnash/patch/gnash-0.8.10-boost-1.50.patch deleted file mode 100644 index 23282d1e89..0000000000 --- a/multimedia/gnash/patch/gnash-0.8.10-boost-1.50.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur a/macros/boost.m4 b/macros/boost.m4 ---- a/macros/boost.m4 2012-09-03 17:11:43.000000000 +0200 -+++ b/macros/boost.m4 2012-10-16 01:58:28.000000000 +0200 -@@ -37,7 +37,7 @@ - boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp program_options/options_description.hpp iostreams/stream.hpp" - dnl this is a list of *required* libraries. If any of these are missing, this - dnl test will return a failure, and Gnash won't build. -- boost_libs="thread program_options iostreams" -+ boost_libs="thread program_options iostreams system" - - dnl this is a list of *recommended* libraries. If any of these are missing, this - dnl test will return a warning, and Gnash will build, but testing won't work. -diff -ur a/plugin/npapi/Makefile.am b/plugin/npapi/Makefile.am ---- a/plugin/npapi/Makefile.am 2012-09-03 17:11:43.000000000 +0200 -+++ b/plugin/npapi/Makefile.am 2012-10-16 01:58:57.000000000 +0200 -@@ -78,7 +78,7 @@ - - libgnashplugin_la_LIBADD = \ - $(GLIB_LIBS) \ -- -lboost_iostreams \ -+ $(BOOST_LIBS) \ - $(NULL) - - # Scriptable plugin support diff --git a/multimedia/gnash/patch/gnash-0.8.10-cve-2012-1175.patch b/multimedia/gnash/patch/gnash-0.8.10-cve-2012-1175.patch deleted file mode 100644 index 9a218d9216..0000000000 --- a/multimedia/gnash/patch/gnash-0.8.10-cve-2012-1175.patch +++ /dev/null @@ -1,63 +0,0 @@ -From bb4dc77eecb6ed1b967e3ecbce3dac6c5e6f1527 Mon Sep 17 00:00:00 2001 -From: Benjamin Wolsey <bwy@benjaminwolsey.de> -Date: Sat, 10 Mar 2012 14:52:50 +0000 -Subject: Fix crash in GnashImage.cpp - ---- -diff --git a/libbase/GnashImage.cpp b/libbase/GnashImage.cpp -index 11c6956..03a6939 100644 ---- a/libbase/GnashImage.cpp -+++ b/libbase/GnashImage.cpp -@@ -26,6 +26,7 @@ - #include <boost/scoped_array.hpp> - #include <boost/shared_ptr.hpp> - #include <algorithm> -+#include <cassert> - - #ifdef USE_PNG - # include "GnashImagePng.h" -@@ -44,6 +45,21 @@ namespace image { - - namespace { - void processAlpha(GnashImage::iterator imageData, size_t pixels); -+ bool checkValidSize(size_t width, size_t height, size_t channels) { -+ -+ if (width == 0 || height == 0) return false; -+ -+ assert(channels > 0); -+ -+ boost::uint32_t maxSize = std::numeric_limits<boost::int32_t>::max(); -+ if (width >= maxSize || height >= maxSize) return false; -+ -+ maxSize /= channels; -+ maxSize /= width; -+ maxSize /= height; -+ -+ return maxSize > 0; -+ } - } - - GnashImage::GnashImage(iterator data, size_t width, size_t height, -@@ -55,6 +71,8 @@ GnashImage::GnashImage(iterator data, size_t width, size_t height, - _height(height), - _data(data) - { -+ // Callers should check dimensions -+ assert(checkValidSize(_width, _height, channels())); - } - - /// Create an image allocating a buffer of height*pitch bytes -@@ -66,8 +84,9 @@ GnashImage::GnashImage(size_t width, size_t height, ImageType type, - _width(width), - _height(height) - { -- const size_t max = std::numeric_limits<boost::int32_t>::max(); -- if (size() > max) { -+ // Constructed from external input, so restrict dimensions to avoid -+ // overflow in size calculations -+ if (!checkValidSize(_width, _height, channels())) { - throw std::bad_alloc(); - } - _data.reset(new value_type[size()]); --- -cgit v0.9.0.2 diff --git a/multimedia/gnash/patch/gnash-0.8.10-kde4-libdir.patch b/multimedia/gnash/patch/gnash-0.8.10-kde4-libdir.patch deleted file mode 100644 index b3279441d2..0000000000 --- a/multimedia/gnash/patch/gnash-0.8.10-kde4-libdir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/macros/kde4.m4 b/macros/kde4.m4 ---- a/macros/kde4.m4 2011-02-26 19:11:08.000000000 +0100 -+++ b/macros/kde4.m4 2011-11-25 18:09:25.000000000 +0100 -@@ -198,7 +198,7 @@ - if test -d ${KDE4_PREFIX}/lib64 -a -f /etc/redhat-release; then - KDE4_PLUGINDIR="${KDE4_PREFIX}/lib64/kde4" - else -- KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4" -+ KDE4_PLUGINDIR="${KDE4_PREFIX}/${acl_libdirstem}/kde4" - fi - fi - if test x"${with_kde4_servicesdir}" != x ; then diff --git a/multimedia/gnash/patch/gnash-0.8.10-klash.patch b/multimedia/gnash/patch/gnash-0.8.10-klash.patch deleted file mode 100644 index e6afec04d2..0000000000 --- a/multimedia/gnash/patch/gnash-0.8.10-klash.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/macros/kde4.m4 b/macros/kde4.m4 ---- a/macros/kde4.m4 2011-02-26 19:11:08.000000000 +0100 -+++ b/macros/kde4.m4 2011-03-21 00:04:38.845997945 +0100 -@@ -210,7 +210,7 @@ - KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config" - fi - if test x"${KDE4_APPSDATADIR}" = x ; then -- KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash" -+ KDE4_APPSDATADIR="${KDE4_PREFIX}/share/apps/klash" - fi - - if test x"${ac_cv_path_kde4_incl}" != x ; then diff --git a/multimedia/gnash/patch/gnash-boost.patch b/multimedia/gnash/patch/gnash-boost.patch deleted file mode 100644 index 55208f1ae3..0000000000 --- a/multimedia/gnash/patch/gnash-boost.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- gnash-0.8.10/libbase/accumulator.h.orig 2016-02-08 02:56:17.059694787 +0700 -+++ gnash-0.8.10/libbase/accumulator.h 2016-02-08 02:57:58.375615249 +0700 -@@ -61,6 +61,11 @@ - virtual unsigned min_tokens() const { return 0; } - virtual unsigned max_tokens() const { return 0; } - -+ #if BOOST_VERSION >= 105900 -+ /// There are no tokens, so this is indifferent. -+ virtual bool adjacent_tokens_only() const { return false; } -+ #endif -+ - /// Accumulating from different sources is silly. - virtual bool is_composing() const { return false; } - diff --git a/multimedia/plexmediaserver/plexmediaserver.SlackBuild b/multimedia/plexmediaserver/plexmediaserver.SlackBuild index 3d09be65cc..462c61ed14 100644 --- a/multimedia/plexmediaserver/plexmediaserver.SlackBuild +++ b/multimedia/plexmediaserver/plexmediaserver.SlackBuild @@ -28,7 +28,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=plexmediaserver -VERSION=${VERSION:-1.22.1.4275_48e10484b} +VERSION=${VERSION:-1.22.2.4282_a97b03fad} PKG_VERSION=$(echo $VERSION | tr _ -) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/multimedia/plexmediaserver/plexmediaserver.info b/multimedia/plexmediaserver/plexmediaserver.info index 4d576879ee..2ac5b50f07 100644 --- a/multimedia/plexmediaserver/plexmediaserver.info +++ b/multimedia/plexmediaserver/plexmediaserver.info @@ -1,10 +1,10 @@ PRGNAM="plexmediaserver" -VERSION="1.22.1.4275_48e10484b" +VERSION="1.22.2.4282_a97b03fad" HOMEPAGE="https://plex.tv/" -DOWNLOAD="https://downloads.plex.tv/plex-media-server-new/1.22.1.4275-48e10484b/debian/plexmediaserver_1.22.1.4275-48e10484b_i386.deb" -MD5SUM="c3116ed088aad80db41586bb985cf98a" -DOWNLOAD_x86_64="https://downloads.plex.tv/plex-media-server-new/1.22.1.4275-48e10484b/debian/plexmediaserver_1.22.1.4275-48e10484b_amd64.deb" -MD5SUM_x86_64="6c758f6f427807fc59b7c635d7f56a92" +DOWNLOAD="https://downloads.plex.tv/plex-media-server-new/1.22.2.4282-a97b03fad/debian/plexmediaserver_1.22.2.4282-a97b03fad_i386.deb" +MD5SUM="6f9bf1be451504c1a23e1050162f5eb6" +DOWNLOAD_x86_64="https://downloads.plex.tv/plex-media-server-new/1.22.2.4282-a97b03fad/debian/plexmediaserver_1.22.2.4282-a97b03fad_amd64.deb" +MD5SUM_x86_64="c57ad0e9fc1c14fafe67f35624047b4d" REQUIRES="" MAINTAINER="Stu Miller" EMAIL="slackbuilds@go4it2day.com" diff --git a/network/basilisk-bin/basilisk-bin.SlackBuild b/network/basilisk-bin/basilisk-bin.SlackBuild index 82bc6872b6..24b2e373fd 100644 --- a/network/basilisk-bin/basilisk-bin.SlackBuild +++ b/network/basilisk-bin/basilisk-bin.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=basilisk-bin SRCNAM=basilisk -VERSION=${VERSION:-2020.10.29} +VERSION=${VERSION:-2021.03.17} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -53,7 +53,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM -tar xvf $CWD/$SRCNAM-latest.linux64.tar.bz2 +tar xvf $CWD/$SRCNAM-latest.linux64.tar.xz cd $SRCNAM chown -R root:root . find -L . \ diff --git a/network/basilisk-bin/basilisk-bin.info b/network/basilisk-bin/basilisk-bin.info index 348fda3df9..1cf23772cb 100644 --- a/network/basilisk-bin/basilisk-bin.info +++ b/network/basilisk-bin/basilisk-bin.info @@ -1,10 +1,10 @@ PRGNAM="basilisk-bin" -VERSION="2020.10.29" +VERSION="2021.03.17" HOMEPAGE="https://www.basilisk-browser.org" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="http://us.basilisk-browser.org/release/basilisk-latest.linux64.tar.xz" -MD5SUM_x86_64="e68ebb5df528759c426519e35def9adb" +DOWNLOAD_x86_64="http://repo.khronosschoty.org/Slackware/basilisk/basilisk-bin/basilisk-latest.linux64.tar.xz" +MD5SUM_x86_64="5edda8852f40000a6a66848d2930c8a9" REQUIRES="" MAINTAINER="khronosschoty" EMAIL="khronosschoty@posteo.org" diff --git a/network/brave-browser/brave-browser.SlackBuild b/network/brave-browser/brave-browser.SlackBuild index 4bb82ab7ef..0a6ef9d8be 100644 --- a/network/brave-browser/brave-browser.SlackBuild +++ b/network/brave-browser/brave-browser.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=brave-browser -VERSION=${VERSION:-1.22.71} +VERSION=${VERSION:-1.23.71} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/brave-browser/brave-browser.info b/network/brave-browser/brave-browser.info index 22d897a50a..9e010bca35 100644 --- a/network/brave-browser/brave-browser.info +++ b/network/brave-browser/brave-browser.info @@ -1,10 +1,10 @@ PRGNAM="brave-browser" -VERSION="1.22.71" +VERSION="1.23.71" HOMEPAGE="https://brave.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/brave/brave-browser/releases/download/v1.22.71/brave-browser-1.22.71-1.x86_64.rpm" -MD5SUM_x86_64="aeb5293bce851b27f9edf6af4f7c9750" +DOWNLOAD_x86_64="https://github.com/brave/brave-browser/releases/download/v1.23.71/brave-browser-1.23.71-1.x86_64.rpm" +MD5SUM_x86_64="af87c4368633ba97a73d13cbfec95d40" REQUIRES="libxkbcommon" MAINTAINER="Andrew Payne" EMAIL="phalange@komputermatrix.com" diff --git a/network/hostapd/README b/network/hostapd/README index 24cfefe967..258a947ed8 100644 --- a/network/hostapd/README +++ b/network/hostapd/README @@ -1,7 +1,7 @@ hostapd - IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator -hostapd is a user space daemon for access point and authentication servers. -It implements IEEE 802.11 access point management, IEEE 802.1X/WPA/WPA2/EAP -Authenticators, RADIUS client, EAP server, and RADIUS authentication server. -The current version supports Linux (Host AP, madwifi, Prism54 drivers) and -FreeBSD (net80211). +hostapd is a user space daemon for access point and authentication +servers. It implements IEEE 802.11 access point management, IEEE +802.1X/WPA/WPA2/EAP Authenticators, RADIUS client, EAP server, and +RADIUS authentication server. The current version supports Linux (Host +AP, madwifi, Prism54 drivers) and FreeBSD (net80211). diff --git a/network/hostapd/hostapd.SlackBuild b/network/hostapd/hostapd.SlackBuild index ae7e86ca5c..d9d8e6401a 100644 --- a/network/hostapd/hostapd.SlackBuild +++ b/network/hostapd/hostapd.SlackBuild @@ -28,7 +28,7 @@ PRGNAM=hostapd VERSION=${VERSION:-2.9} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then diff --git a/network/hostapd/patches/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch b/network/hostapd/patches/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch new file mode 100644 index 0000000000..1942bb3d55 --- /dev/null +++ b/network/hostapd/patches/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch @@ -0,0 +1,50 @@ +From 8460e3230988ef2ec13ce6b69b687e941f6cdb32 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <jouni@codeaurora.org> +Date: Tue, 8 Dec 2020 23:52:50 +0200 +Subject: [PATCH] P2P: Fix a corner case in peer addition based on PD Request + +p2p_add_device() may remove the oldest entry if there is no room in the +peer table for a new peer. This would result in any pointer to that +removed entry becoming stale. A corner case with an invalid PD Request +frame could result in such a case ending up using (read+write) freed +memory. This could only by triggered when the peer table has reached its +maximum size and the PD Request frame is received from the P2P Device +Address of the oldest remaining entry and the frame has incorrect P2P +Device Address in the payload. + +Fix this by fetching the dev pointer again after having called +p2p_add_device() so that the stale pointer cannot be used. + +Fixes: 17bef1e97a50 ("P2P: Add peer entry based on Provision Discovery Request") +Signed-off-by: Jouni Malinen <jouni@codeaurora.org> +--- + src/p2p/p2p_pd.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c +index 3994ec03f86b..05fd593494ef 100644 +--- a/src/p2p/p2p_pd.c ++++ b/src/p2p/p2p_pd.c +@@ -595,14 +595,12 @@ void p2p_process_prov_disc_req(struct p2p_data *p2p, const u8 *sa, + goto out; + } + ++ dev = p2p_get_device(p2p, sa); + if (!dev) { +- dev = p2p_get_device(p2p, sa); +- if (!dev) { +- p2p_dbg(p2p, +- "Provision Discovery device not found " +- MACSTR, MAC2STR(sa)); +- goto out; +- } ++ p2p_dbg(p2p, ++ "Provision Discovery device not found " ++ MACSTR, MAC2STR(sa)); ++ goto out; + } + } else if (msg.wfd_subelems) { + wpabuf_free(dev->info.wfd_subelems); +-- +2.25.1 + diff --git a/network/hostapd/patches/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch b/network/hostapd/patches/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch new file mode 100644 index 0000000000..4657b55d85 --- /dev/null +++ b/network/hostapd/patches/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch @@ -0,0 +1,38 @@ +From 947272febe24a8f0ea828b5b2f35f13c3821901e Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <jouni@codeaurora.org> +Date: Mon, 9 Nov 2020 11:43:12 +0200 +Subject: [PATCH] P2P: Fix copying of secondary device types for P2P group + client + +Parsing and copying of WPS secondary device types list was verifying +that the contents is not too long for the internal maximum in the case +of WPS messages, but similar validation was missing from the case of P2P +group information which encodes this information in a different +attribute. This could result in writing beyond the memory area assigned +for these entries and corrupting memory within an instance of struct +p2p_device. This could result in invalid operations and unexpected +behavior when trying to free pointers from that corrupted memory. + +Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=27269 +Fixes: e57ae6e19edf ("P2P: Keep track of secondary device types for peers") +Signed-off-by: Jouni Malinen <jouni@codeaurora.org> +--- + src/p2p/p2p.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c +index 74b7b52ae05c..5cbfc217fc1f 100644 +--- a/src/p2p/p2p.c ++++ b/src/p2p/p2p.c +@@ -453,6 +453,8 @@ static void p2p_copy_client_info(struct p2p_device *dev, + dev->info.config_methods = cli->config_methods; + os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8); + dev->info.wps_sec_dev_type_list_len = 8 * cli->num_sec_dev_types; ++ if (dev->info.wps_sec_dev_type_list_len > WPS_SEC_DEV_TYPE_MAX_LEN) ++ dev->info.wps_sec_dev_type_list_len = WPS_SEC_DEV_TYPE_MAX_LEN; + os_memcpy(dev->info.wps_sec_dev_type_list, cli->sec_dev_types, + dev->info.wps_sec_dev_type_list_len); + } +-- +2.25.1 + diff --git a/network/keepalived/README b/network/keepalived/README index 5e28a766a0..bf9df21cd2 100644 --- a/network/keepalived/README +++ b/network/keepalived/README @@ -13,3 +13,5 @@ this server entrie from the LVS topology. In addition keepalived implements an independent VRRPv2 stack to handle director failover. So in short keepalived is a userspace daemon for LVS cluster nodes healthchecks and LVS directors failover. + +WARNING: nftables and libipset support are disabled for Slackware 14.2 diff --git a/network/keepalived/keepalived.SlackBuild b/network/keepalived/keepalived.SlackBuild index 2719b1d65f..c23734e1aa 100644 --- a/network/keepalived/keepalived.SlackBuild +++ b/network/keepalived/keepalived.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=keepalived -VERSION=${VERSION:-2.1.5} +VERSION=${VERSION:-2.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -79,6 +79,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --with-kernel-dir=/usr \ --disable-nftables \ + --disable-libipset \ --build=$ARCH-slackware-linux make diff --git a/network/keepalived/keepalived.info b/network/keepalived/keepalived.info index 96be269396..3677d84db9 100644 --- a/network/keepalived/keepalived.info +++ b/network/keepalived/keepalived.info @@ -1,8 +1,8 @@ PRGNAM="keepalived" -VERSION="2.1.5" +VERSION="2.2.2" HOMEPAGE="https://www.keepalived.org/" -DOWNLOAD="https://www.keepalived.org/software/keepalived-2.1.5.tar.gz" -MD5SUM="27e1cfff5b8dd95062ad415957e663e5" +DOWNLOAD="https://www.keepalived.org/software/keepalived-2.2.2.tar.gz" +MD5SUM="2e86bade4a7a48cfac7d35a6c9643d46" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/nweb/README b/network/nweb/README new file mode 100644 index 0000000000..9f882d64d9 --- /dev/null +++ b/network/nweb/README @@ -0,0 +1,23 @@ +A tiny web server in C. + +nweb is a small and very safe mini web server nweb only servers out +file/web pages with extensions named below and only from the named +directory or its sub-directories. + +There is no fancy features = safe and secure. + +Example: nweb 8181 /home/nwebdir & + +Only Supports: gif jpg jpeg png ico zip gz tar htm html +Not Supported: URLs including "..", Java, Javascript, CGI +Not Supported: directories / /etc /bin /lib /tmp /usr /dev /sbin + +client.c: + +Also included is the source for a client. This client.c program is +designed to fake being a web browser. It sends the expected requests to +the web server over a network socket connection and displays the results +as text rather than graphically displaying the results. In the code you +will have to change the two lines as below to match your web server or +nweb server. See README.client for instructions. The client.c source +code can be found in the /usr/doc/nweb-<VERSION> directory. diff --git a/network/nweb/README.client b/network/nweb/README.client new file mode 100644 index 0000000000..1fd848e0bd --- /dev/null +++ b/network/nweb/README.client @@ -0,0 +1,64 @@ + client.c + +This client.c program is designed to fake being a web browser. It sends the +expected requests to the web server over a network socket connection and +displays the results as text rather than graphically displaying the results. In +the code you will have to change the two lines as below to match your web +server or nweb server. + +/* YOU WILL HAVE TO CHANGE THESE TWO LINES TO MATCH YOUR CONFIG / #define PORT + * 8181 / +Port number as an integer - web server default is 80 / #define IP_ADDRESS +"192.168.0.8" / IP Address as a string */ + +The default is to request the /index.html from the web server. If you want to +request another file then change the GET line as below: + +char *command = "GET /index.html HTTP/1.0 \r\n\r\n" ; + +To, for example: + +char *command = "GET /nigel.jpg HTTP/1.0 \r\n\r\n" ; + +Then compile the program with: cc client.c -o client + +I save the output in to a file as putting a non-test file like .jpg to the +terminal screen can cause chaos: client >output + +Then edit the output file: vi output + +In real life, the interaction of web browser and web server can be much more complex. + + 1. The web browser can tell the web server about its name, version and capabilities. + + 2. The web server can send complex file types line JavaScript or Java programs +or other active components. + + 3. They can maintain a longer connection over the socket for efficiency. + + 4. Below is an example of my Firefox brower requesting an index.html file. I +have added newline characters to make it readable - it is 1300 bytes long! I +have no idea what most of it is about. You will have to read the The World Wide +Web Consortium (W3C) at http://www.w3.org for all the details. + +GET /index.html HTTP/1.1Host: myserver.home.com:80User-Agent: Mozilla/5.0 (W indows; +U; Windows NT 5.1; en-GB; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28 (.NET CLR +3.5.30729)Ac cept: image/png,image/;q=0.8,/*;q=0.5Accept-Language: +en-gb,en;q=0.5Accept-Encoding: gzip,defla teAccept-Charset: ISO-8859-1,utf-8; +q=0.7,*;q=0.7Keep-Alive: 115Connection: keep-alive**Referer: +http://myserver.uk.home.com:8181/index.html**Cookie: +__utma=101107545.1790272076.1316019590.13289002 55.1328908680.164; +__utmz=101107545.1328566199.157.46.utmcsr=t.co|utmccn=(referral)|utmcmd=referral| u +tmcct=/iTJx4DO1; UnicaNIODID=ZBr8gm79vIG-XKeoGGb; W3SSO_ACCESS=abc.home.com; +ISP=70fdfc95 +d93011d783e4de784ea97766-70fdfc95d93011d783e4de784ea97766-f67749a8b899e8ceed7e940b8c4bf189; +Prof ile=2000121913394303111032836125|EN|866|866.BDF|en-GB; +_unam=693fb60-1337f162b72-11770d11-5; WLS intra_USERID=nigel@hotmail.com; +ipcInfo=cc%3Duk%3Blc%3Den%3Bac%3Dall; iwm1p=214617669; bprememberme=nigel@ +hotmail.com; EPSPROFILE=EE2355DFE16AE020BE6C62FCB6BF5602; +DWPERM=Xa.2/Xb.Xzso3-U35t8RWKvqBreGaQMgsP_RG +Fl1124oIt-L-OPJIdSautkBN0D4NUp9JLlpUqPqB6CWOo-pgrJwhxNvvSfPAajgetaA2MOYwHfQPXPTRG9zwOMMR57EHQtXhOy5Om +yzanyZthvVClm6uxvbwh0isEQ2Mm_9g2l7NjcA3RJdjuLaB3qlljOmyVuhDjBkgdNEb3PgYcCpbiu1FUzXrhPalhgsbAj7NBkaY88 +Yyg/Xc./Xd./Xf./Xg.1696801 + +I hope this has been instructive, thanks, Nigel Griffiths diff --git a/desktop/dmenu2/dmenu2.SlackBuild b/network/nweb/nweb.SlackBuild index 4f1de8103b..cd2ac1d290 100644 --- a/desktop/dmenu2/dmenu2.SlackBuild +++ b/network/nweb/nweb.SlackBuild @@ -1,6 +1,8 @@ #!/bin/sh -# Copyright (c) 2014, Simon Bolokanov, Bulgaria <sbolokanov@abv.bg> +# Slackware build script for nweb + +# Copyright 2021 Dave Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,17 +22,15 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Симон Болоканов <sbolokanov@abv.bg> -# dmenu2 v0.2 - init script - 14.09.2014 - -PRGNAM=dmenu2 -VERSION=${VERSION:-0.2} +PRGNAM=nweb +COMMIT=${COMMIT:-867a6dd46298c882501f5c26d31ee821177542ab} +VERSION=${VERSION:-23_"$( printf %s $COMMIT | cut -c 1-7 )"} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -58,11 +58,11 @@ fi set -e rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT +mkdir -p $TMP $PKG/usr/bin $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$COMMIT +tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz +cd $PRGNAM-$COMMIT chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -70,26 +70,16 @@ 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 {} \; -# config setup -patch -p1 < $CWD/dmenu2-0.2-config-fix.diff - -make clean install \ - OPTS="$SLKCFLAGS" \ - PREFIX=/usr \ - LIBDIR=/usr/lib${LIBDIRSUFFIX} \ - MANPREFIX=/usr/man \ - X11INC=/usr/include \ - X11LIB=/usr/lib${LIBDIRSUFFIX}/X11 \ - DESTDIR=$PKG +${CC:-gcc} $SLKCFLAGS nweb${VERSION:0:2}.c -o $PKG/usr/bin/nweb +strip --strip-unneeded $PKG/usr/bin/nweb -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 +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{www-example,client} -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 +cp -a client.c $PKG/usr/doc/$PRGNAM-$VERSION/client +cp -a nigel.jpg favicon.ico nweb.log index.html \ + $PKG/usr/doc/$PRGNAM-$VERSION/www-example -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README.md $CWD/README.client $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/nweb/nweb.info b/network/nweb/nweb.info new file mode 100644 index 0000000000..1690b8b5b1 --- /dev/null +++ b/network/nweb/nweb.info @@ -0,0 +1,10 @@ +PRGNAM="nweb" +VERSION="23_867a6dd" +HOMEPAGE="https://github.com/ankushagarwal/nweb" +DOWNLOAD="https://github.com/ankushagarwal/nweb/archive/867a6dd46298c882501f5c26d31ee821177542ab/nweb-867a6dd46298c882501f5c26d31ee821177542ab.tar.gz" +MD5SUM="7570ab89a441f1b11f2ab099660b9daa" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Dave Woodfall" +EMAIL="dave@slackbuilds.org" diff --git a/network/nweb/slack-desc b/network/nweb/slack-desc new file mode 100644 index 0000000000..a271191935 --- /dev/null +++ b/network/nweb/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------------------------------------------------------| +nweb: nweb (A tiny web server in C) +nweb: +nweb: nweb is a small and very safe mini web server nweb only servers out +nweb: file/web pages with certain extensions and only from the named +nweb: directory or its sub-directories. +nweb: +nweb: There is no fancy features = safe and secure. +nweb: +nweb: Example: nweb 8181 /home/nwebdir & +nweb: +nweb: diff --git a/network/palemoon-bin/README b/network/palemoon-bin/README index ee331b0de8..3487167d82 100644 --- a/network/palemoon-bin/README +++ b/network/palemoon-bin/README @@ -11,3 +11,8 @@ dictionary by passing the USE_SYSTEM_SPELLCHECK=yes variable to the script. If you need to change the GUI language, please visit https://www.palemoon.org/langpacks.shtml and follow the installation instructions. + +NOTE: +32 bit packages have been discontinued; and 64 bit binaries are now released +in gtk2 and gtk3 variations. If you desire to use a gtk3 variation, pass the +variable GTK=gtk3 to the script. diff --git a/network/palemoon-bin/palemoon-bin.SlackBuild b/network/palemoon-bin/palemoon-bin.SlackBuild index 8044d15638..7a39dbda60 100644 --- a/network/palemoon-bin/palemoon-bin.SlackBuild +++ b/network/palemoon-bin/palemoon-bin.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=palemoon-bin SRCNAM=palemoon -VERSION=${VERSION:-28.10.0} +VERSION=${VERSION:-29.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -43,6 +43,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +GTK=${GTK:-gtk2} + # We don't need cflags since nothing is being compiled here. # We do need to check the architecture though and abort when it's not # supported. @@ -63,7 +65,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM -tar xvf $CWD/$SRCNAM-$VERSION.linux-$ARCH.tar.xz +tar xvf $CWD/$SRCNAM-$VERSION.linux-$ARCH-$GTK.tar.xz cd $SRCNAM chown -R root:root . find -L . \ diff --git a/network/palemoon-bin/palemoon-bin.info b/network/palemoon-bin/palemoon-bin.info index 44cfbf47df..db48f7cb3d 100644 --- a/network/palemoon-bin/palemoon-bin.info +++ b/network/palemoon-bin/palemoon-bin.info @@ -1,10 +1,10 @@ PRGNAM="palemoon-bin" -VERSION="28.10.0" +VERSION="29.1.1" HOMEPAGE="https://www.palemoon.org/" -DOWNLOAD="http://linux.palemoon.org/datastore/release/palemoon-28.10.0.linux-i686.tar.xz" -MD5SUM="66c128fa4ccabc826cdbdaadfb1ef3d4" -DOWNLOAD_x86_64="http://linux.palemoon.org/datastore/release/palemoon-28.10.0.linux-x86_64.tar.xz" -MD5SUM_x86_64="28f399a683de466e1468243d6fba2291" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="http://linux.palemoon.org/datastore/release/palemoon-29.1.1.linux-x86_64-gtk2.tar.xz" +MD5SUM_x86_64="1a39e784adcd7891c391195fabcbb06a" REQUIRES="" MAINTAINER="khronosschoty" EMAIL="khronosschoty@posteo.org" diff --git a/network/palemoon/palemoon.SlackBuild b/network/palemoon/palemoon.SlackBuild index 3fc054c81a..321f5f88d0 100644 --- a/network/palemoon/palemoon.SlackBuild +++ b/network/palemoon/palemoon.SlackBuild @@ -26,10 +26,10 @@ # Special thanks to Ponce PRGNAM=palemoon -VERSION=${VERSION:-29.0.1} +VERSION=${VERSION:-29.1.1} SRCNAM1=${SRCNAM1:-Pale-Moon-${VERSION}_Release} SRCNAM2=${SRCNAM2:-pale-moon} -SRCNAM3=${SRCNAM3:-UXP-RELBASE_20210205} +SRCNAM3=${SRCNAM3:-UXP-RELBASE_20210330} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/palemoon/palemoon.info b/network/palemoon/palemoon.info index f147fef3b5..614b3b3b55 100644 --- a/network/palemoon/palemoon.info +++ b/network/palemoon/palemoon.info @@ -1,11 +1,11 @@ PRGNAM="palemoon" -VERSION="29.0.1" +VERSION="29.1.1" HOMEPAGE="http://www.palemoon.org/" -DOWNLOAD="http://repo.khronosschoty.org/Slackware/Pale-Moon/source/Pale-Moon-29.0.1_Release.tar.gz - http://repo.khronosschoty.org/Slackware/Pale-Moon/source/UXP-RELBASE_20210205.tar.gz \ +DOWNLOAD="http://repo.khronosschoty.org/Slackware/Pale-Moon/source/Pale-Moon-29.1.1_Release.tar.gz + http://repo.khronosschoty.org/Slackware/Pale-Moon/source/UXP-RELBASE_20210330.tar.gz \ http://ponce.cc/slackware/sources/repo/autoconf-2.13.tar.xz" -MD5SUM="6fccd342aedf62b9b947de4ccad4d577 \ - 11ba1291ebfe985823e8ac5e81a557e1 \ +MD5SUM="f522cab929ec62382dc30391a590b039 \ + 535724b8fbb0d791cdf48f456969df9f \ f2994d302cf736e7e71974edfa51da3c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/network/qutebrowser-tox/8232d38.patch b/network/qutebrowser-tox/8232d38.patch new file mode 100644 index 0000000000..952170b1bd --- /dev/null +++ b/network/qutebrowser-tox/8232d38.patch @@ -0,0 +1,42 @@ +From 8232d384929641be7409e026d20843a2edd73e48 Mon Sep 17 00:00:00 2001 +From: Florian Bruhin <me@the-compiler.org> +Date: Tue, 13 Apr 2021 16:33:13 +0200 +Subject: [PATCH] notifications: Handle MaxNotificationsExceeded error from + GNOME Flashback + +(cherry picked from commit 2cfc64579a22e7dd933c9591e6bb141b877b58e0) +--- + qutebrowser/browser/webengine/notification.py | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/qutebrowser/browser/webengine/notification.py b/qutebrowser/browser/webengine/notification.py +index 36493f4f72..5e32b63276 100644 +--- a/qutebrowser/browser/webengine/notification.py ++++ b/qutebrowser/browser/webengine/notification.py +@@ -693,6 +693,15 @@ class DBusNotificationAdapter(AbstractNotificationAdapter): + SPEC_VERSION = "1.2" # Released in January 2011, still current in March 2021. + NAME = "libnotify" + ++ _NON_FATAL_ERRORS = { ++ # notification daemon is gone ++ "org.freedesktop.DBus.Error.NoReply", ++ ++ # https://gitlab.gnome.org/GNOME/gnome-flashback/-/blob/3.40.0/gnome-flashback/libnotifications/nd-daemon.c#L178-187 ++ # Exceeded maximum number of notifications ++ "org.freedesktop.Notifications.MaxNotificationsExceeded", ++ } ++ + def __init__(self, parent: QObject = None) -> None: + super().__init__(bridge) + if not qtutils.version_check('5.14'): +@@ -878,8 +887,8 @@ def _verify_message( + + if msg.type() == QDBusMessage.ErrorMessage: + err = msg.errorName() +- if err == "org.freedesktop.DBus.Error.NoReply": +- self.error.emit(msg.errorMessage()) # notification daemon is gone ++ if err in self._NON_FATAL_ERRORS: ++ self.error.emit(msg.errorMessage()) + return + + raise Error(f"Got DBus error: {err} - {msg.errorMessage()}") diff --git a/network/qutebrowser-tox/qutebrowser-tox.SlackBuild b/network/qutebrowser-tox/qutebrowser-tox.SlackBuild index 32d02e5e07..40794c7ea8 100644 --- a/network/qutebrowser-tox/qutebrowser-tox.SlackBuild +++ b/network/qutebrowser-tox/qutebrowser-tox.SlackBuild @@ -23,9 +23,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qutebrowser-tox -VERSION=${VERSION:-2.1.1} +VERSION=${VERSION:-2.2.0} SSLVERSION=${SSLVERSION:-1.1.1k} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -67,6 +67,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 {} \; +patch -p1 < $CWD/8232d38.patch + python3 scripts/mkvenv.py --skip-smoke-test mv scripts/mkvenv.py.bak scripts/mkvenv.py diff --git a/network/qutebrowser-tox/qutebrowser-tox.info b/network/qutebrowser-tox/qutebrowser-tox.info index 0c33f73d93..7e33863895 100644 --- a/network/qutebrowser-tox/qutebrowser-tox.info +++ b/network/qutebrowser-tox/qutebrowser-tox.info @@ -1,11 +1,11 @@ PRGNAM="qutebrowser-tox" -VERSION="2.1.1" +VERSION="2.2.0" HOMEPAGE="https://qutebrowser.org" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/qutebrowser/qutebrowser/archive/v2.1.1/qutebrowser-2.1.1.tar.gz \ +DOWNLOAD_x86_64="https://github.com/qutebrowser/qutebrowser/archive/v2.2.0/qutebrowser-2.2.0.tar.gz \ https://files.pythonhosted.org/packages/fe/ef/60d7ba03b5c442309ef42e7d69959f73aacccd0d86008362a681c4698e83/pip-21.0.1-py3-none-any.whl \ - https://files.pythonhosted.org/packages/9e/d4/b99a960314121a003e9f39c61dfde01a1010bb47661e193a7722f7f32d52/setuptools-54.2.0-py3-none-any.whl \ + https://files.pythonhosted.org/packages/ae/42/2876a3a136f8bfa9bd703518441c8db78ff1eeaddf174baa85c083c1fd15/setuptools-56.0.0-py3-none-any.whl \ https://files.pythonhosted.org/packages/65/63/39d04c74222770ed1589c0eaba06c05891801219272420b40311cd60c880/wheel-0.36.2-py2.py3-none-any.whl \ https://files.pythonhosted.org/packages/ed/62/cd9f10702c75b242f82da858668fba0cda04cda92133244d3d1555e530b4/PyQt5-5.15.4-cp36.cp37.cp38.cp39-abi3-manylinux2014_x86_64.whl \ https://files.pythonhosted.org/packages/83/d4/241a6a518d0bcf0a9fcdcbad5edfed18d43e884317eab8d5230a2b27e206/PyQt5_Qt5-5.15.2-py3-none-manylinux2014_x86_64.whl \ @@ -14,7 +14,7 @@ DOWNLOAD_x86_64="https://github.com/qutebrowser/qutebrowser/archive/v2.1.1/quteb https://files.pythonhosted.org/packages/48/62/117c9c96837287b181fce6da481065ddda68b3a8c0fa5f00ea62cc08b877/PyQtWebEngine_Qt5-5.15.2-py3-none-manylinux2014_x86_64.whl \ https://files.pythonhosted.org/packages/39/5d/68618c48e0c2f051143d0dfb981dc9098fe3362f77bfe53bb6f970800ac2/adblock-0.4.3-cp37-cp37m-manylinux2010_x86_64.whl \ https://files.pythonhosted.org/packages/44/98/5b86278fbbf250d239ae0ecb724f8572af1c91f4a11edf4d36a206189440/colorama-0.4.4-py2.py3-none-any.whl \ - https://files.pythonhosted.org/packages/d9/10/191b97506cd4cceb4b860fb5c75b26feeefbca5a8f7f4687bca71e215cc6/importlib_metadata-3.9.0-py3-none-any.whl \ + https://files.pythonhosted.org/packages/99/8f/b0ac918b2234848ec5bd2a887d2be7d6686355fcb22d7a0efe878d5c1555/importlib_metadata-3.10.0-py3-none-any.whl \ https://files.pythonhosted.org/packages/f0/5e/69e6a0602c1f18d390952177de648468c4a380252858b0022affc3ce7811/importlib_resources-5.1.2-py3-none-any.whl \ https://files.pythonhosted.org/packages/7e/c2/1eece8c95ddbc9b1aeb64f5783a9e07a286de42191b7204d67b7496ddf35/Jinja2-2.11.3-py2.py3-none-any.whl \ https://files.pythonhosted.org/packages/c2/37/2e4def8ce3739a258998215df907f5815ecd1af71e62147f5eea2d12d4e8/MarkupSafe-1.1.1-cp37-cp37m-manylinux2010_x86_64.whl \ @@ -24,9 +24,9 @@ DOWNLOAD_x86_64="https://github.com/qutebrowser/qutebrowser/archive/v2.1.1/quteb https://files.pythonhosted.org/packages/0f/8c/715c54e9e34c0c4820f616a913a7de3337d0cd79074dd1bed4dd840f16ae/zipp-3.4.1-py3-none-any.whl \ https://github.com/mozilla/pdf.js/releases/download/v2.7.570/pdfjs-2.7.570-dist.zip \ https://www.openssl.org/source/openssl-1.1.1k.tar.gz" -MD5SUM_x86_64="5e268ad53f82944e33a8dbcf257b6aa4 \ +MD5SUM_x86_64="c3d6baacef40ee84e0c5b01fd0f3e3a7 \ e6e25dc3ecf3bab199b5ba1f14e81474 \ - c701dde33ba15c744c527d7df20220dd \ + 23559a79917a14480246c46e797e73c5 \ 6c222a4df97a3311b4e189a59c47dea0 \ 2020d0624acda6a6ab1abdb868f146ae \ 038f56bd7af99133f591c7497b64ea17 \ @@ -35,7 +35,7 @@ MD5SUM_x86_64="5e268ad53f82944e33a8dbcf257b6aa4 \ d9fe06e7758913f32dc09324ff9abfdf \ 504321e0e009e2fbb194ffde9d9a594a \ 1dcd07acf2b1875ed09428e1ddf7e028 \ - 3272b1c03591bf32cea19bf20e5d0cab \ + f99fe16a8f0c96a7149bd99a84dbb6f9 \ 4414bda5a4cd09f2b87cffa1aa10fd33 \ 8e733c6f4cdef7f6a336299e8e548dfa \ c9c9888fa812cc8bc44cf6951b5d84e1 \ diff --git a/network/qutebrowser/qutebrowser.SlackBuild b/network/qutebrowser/qutebrowser.SlackBuild index 91dd428a74..ad93cee7ae 100644 --- a/network/qutebrowser/qutebrowser.SlackBuild +++ b/network/qutebrowser/qutebrowser.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qutebrowser -VERSION=${VERSION:-2.1.1} +VERSION=${VERSION:-2.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/qutebrowser/qutebrowser.info b/network/qutebrowser/qutebrowser.info index faafaa03ff..c7fd782303 100644 --- a/network/qutebrowser/qutebrowser.info +++ b/network/qutebrowser/qutebrowser.info @@ -1,8 +1,8 @@ PRGNAM="qutebrowser" -VERSION="2.1.1" +VERSION="2.2.0" HOMEPAGE="http://qutebrowser.org/" -DOWNLOAD="https://github.com/qutebrowser/qutebrowser/releases/download/v2.1.1/qutebrowser-2.1.1.tar.gz" -MD5SUM="f756b204c7ad2ff1321cb55787df0d28" +DOWNLOAD="https://github.com/qutebrowser/qutebrowser/releases/download/v2.2.0/qutebrowser-2.2.0.tar.gz" +MD5SUM="762d7dc0f939ee0ca54701ba233e7175" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-PyYAML Jinja2 python3-PyQtWebEngine python-toml importlib-resources python-zipp" diff --git a/network/qutebrowser/slack-desc b/network/qutebrowser/slack-desc index d0989d4c8a..9d4ae8def6 100644 --- a/network/qutebrowser/slack-desc +++ b/network/qutebrowser/slack-desc @@ -10,10 +10,10 @@ qutebrowser: qutebrowser (qt5 keyboard driven webbrowser) qutebrowser: qutebrowser: qutebrowser is a keyboard-focused browser with a minimal GUI. It's qutebrowser: based on Python and PyQt5 and free software, licensed under the GPL. -qutebrowser: It was inspired by other browsers/addons like dwb and -qutebrowser: Vimperator/Pentadactyl. +qutebrowser: +qutebrowser: It was inspired by other browsers/addons like Vimperator/Pentadactyl +qutebrowser: and dwb. qutebrowser: qutebrowser: qt5-webkit is an optional dependency for the webkit backend. qutebrowser: qutebrowser: https://qutebrowser.org -qutebrowser: diff --git a/network/signal-desktop/signal-desktop.SlackBuild b/network/signal-desktop/signal-desktop.SlackBuild index 45ac354140..dff9df468f 100644 --- a/network/signal-desktop/signal-desktop.SlackBuild +++ b/network/signal-desktop/signal-desktop.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=signal-desktop -VERSION=${VERSION:-1.40.1} +VERSION=${VERSION:-5.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/signal-desktop/signal-desktop.info b/network/signal-desktop/signal-desktop.info index a7d6147920..9804287ed4 100644 --- a/network/signal-desktop/signal-desktop.info +++ b/network/signal-desktop/signal-desktop.info @@ -1,10 +1,10 @@ PRGNAM="signal-desktop" -VERSION="1.40.1" +VERSION="5.0.0" HOMEPAGE="https://signal.org/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://sourceforge.net/projects/slackbuildsdirectlinks/files/signal-desktop/signal-desktop_1.40.1_amd64.deb" -MD5SUM_x86_64="f3bf4c2a329a5936b9c04a62e5949668" +DOWNLOAD_x86_64="https://sourceforge.net/projects/slackbuildsdirectlinks/files/signal-desktop/signal-desktop_5.0.0_amd64.deb" +MD5SUM_x86_64="08bb40ef176be688cec25957a06fffd8" REQUIRES="libxkbcommon" MAINTAINER="David O'Shaughnessy" EMAIL="dev@osh.id.au" diff --git a/network/spamassassin/spamassassin.SlackBuild b/network/spamassassin/spamassassin.SlackBuild index 1542173d0c..5b982b084e 100644 --- a/network/spamassassin/spamassassin.SlackBuild +++ b/network/spamassassin/spamassassin.SlackBuild @@ -28,7 +28,7 @@ # spamassassin database, and most of spamassassin dependencies' scripts. PRGNAM=spamassassin -VERSION=${VERSION:-3.4.5} +VERSION=${VERSION:-3.4.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/spamassassin/spamassassin.info b/network/spamassassin/spamassassin.info index 4c98a99e00..bfa522dc00 100644 --- a/network/spamassassin/spamassassin.info +++ b/network/spamassassin/spamassassin.info @@ -1,8 +1,8 @@ PRGNAM="spamassassin" -VERSION="3.4.5" +VERSION="3.4.6" HOMEPAGE="https://spamassassin.apache.org/" -DOWNLOAD="https://downloads.apache.org//spamassassin/source/Mail-SpamAssassin-3.4.5.tar.bz2" -MD5SUM="66c928ac3e235c33c22a85844ae14fb3" +DOWNLOAD="https://downloads.apache.org//spamassassin/source/Mail-SpamAssassin-3.4.6.tar.bz2" +MD5SUM="0ef3f64ffcdf6f1e96068e19a16ce1be" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libwww-perl perl-Crypt-OpenSSL-Bignum perl-Encode-Detect perl-IO-Socket-INET6 perl-IO-Socket-SSL perl-IP-Country perl-Image-Info perl-Mail-DKIM perl-Mail-SPF perl-Net-Ident perl-Net-Server pyzor re2c" diff --git a/network/unbound/unbound.SlackBuild b/network/unbound/unbound.SlackBuild index b35d89548b..a305c32a7a 100644 --- a/network/unbound/unbound.SlackBuild +++ b/network/unbound/unbound.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=unbound -VERSION=${VERSION:-1.10.0} +VERSION=${VERSION:-1.13.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -123,7 +123,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/var/run/unbound chown $USER:$GROUP $PKG/var/run/unbound/ -install -m 0640 -D doc/example.conf.in $PKG/etc/unbound/unbound.conf.new +mv $PKG/etc/unbound/unbound.conf $PKG/etc/unbound/unbound.conf.new install -m 0644 -D $CWD/rc.unbound $PKG/etc/rc.d/rc.unbound.new mkdir -p $PKG/install diff --git a/network/unbound/unbound.info b/network/unbound/unbound.info index 467b1fbcc6..0d32e3cc39 100644 --- a/network/unbound/unbound.info +++ b/network/unbound/unbound.info @@ -1,8 +1,8 @@ PRGNAM="unbound" -VERSION="1.10.0" +VERSION="1.13.1" HOMEPAGE="https://nlnetlabs.nl/projects/unbound/about/" -DOWNLOAD="https://nlnetlabs.nl/downloads/unbound/unbound-1.10.0.tar.gz" -MD5SUM="0754392baee77c18fd8295b5e51e6fd8" +DOWNLOAD="https://nlnetlabs.nl/downloads/unbound/unbound-1.13.1.tar.gz" +MD5SUM="0cd660a40d733acc6e7cce43731cac62" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ldns" diff --git a/office/calcurse/calcurse.SlackBuild b/office/calcurse/calcurse.SlackBuild index 3d59585678..41c8d29ce6 100644 --- a/office/calcurse/calcurse.SlackBuild +++ b/office/calcurse/calcurse.SlackBuild @@ -27,7 +27,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=calcurse -VERSION=${VERSION:-4.7.0} +VERSION=${VERSION:-4.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/calcurse/calcurse.info b/office/calcurse/calcurse.info index e9cbb0c2b2..d3a8a11736 100644 --- a/office/calcurse/calcurse.info +++ b/office/calcurse/calcurse.info @@ -1,8 +1,8 @@ PRGNAM="calcurse" -VERSION="4.7.0" +VERSION="4.7.1" HOMEPAGE="http://calcurse.org/" -DOWNLOAD="https://calcurse.org/files/calcurse-4.7.0.tar.gz" -MD5SUM="0377ab767e2c9a0c2c045c94d18fc23c" +DOWNLOAD="https://calcurse.org/files/calcurse-4.7.1.tar.gz" +MD5SUM="1645068d2a15da6c773f231a1441a760" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/calibre-bin/calibre-bin.SlackBuild b/office/calibre-bin/calibre-bin.SlackBuild index 415caacf22..def2d94619 100644 --- a/office/calibre-bin/calibre-bin.SlackBuild +++ b/office/calibre-bin/calibre-bin.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=calibre-bin -VERSION=${VERSION:-5.14.0} +VERSION=${VERSION:-5.15.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/calibre-bin/calibre-bin.info b/office/calibre-bin/calibre-bin.info index 13283f2499..66002b3a25 100644 --- a/office/calibre-bin/calibre-bin.info +++ b/office/calibre-bin/calibre-bin.info @@ -1,10 +1,10 @@ PRGNAM="calibre-bin" -VERSION="5.14.0" +VERSION="5.15.0" HOMEPAGE="https://calibre-ebook.com" -DOWNLOAD="https://download.calibre-ebook.com/5.14.0/calibre-5.14.0-i686.txz" -MD5SUM="cacae9b6017d98b0cb0f1729b69912a9" -DOWNLOAD_x86_64="https://download.calibre-ebook.com/5.14.0/calibre-5.14.0-x86_64.txz" -MD5SUM_x86_64="075e5e00a5c65daceb5a96100e15f076" +DOWNLOAD="https://download.calibre-ebook.com/5.15.0/calibre-5.15.0-i686.txz" +MD5SUM="66fd3a67515ea40d67267bea163ad929" +DOWNLOAD_x86_64="https://download.calibre-ebook.com/5.15.0/calibre-5.15.0-x86_64.txz" +MD5SUM_x86_64="2d0a5e8c350537f79efda07610c089fc" REQUIRES="libxkbcommon" MAINTAINER="Alexander Verbovetsky" EMAIL="alik@ejik.org" diff --git a/perl/perl-Math-GMPz/perl-Math-GMPz.SlackBuild b/perl/perl-Math-GMPz/perl-Math-GMPz.SlackBuild index cdf09c1dae..985f2a87f9 100644 --- a/perl/perl-Math-GMPz/perl-Math-GMPz.SlackBuild +++ b/perl/perl-Math-GMPz/perl-Math-GMPz.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=perl-Math-GMPz -VERSION=${VERSION:-0.49} +VERSION=${VERSION:-0.50} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/perl/perl-Math-GMPz/perl-Math-GMPz.info b/perl/perl-Math-GMPz/perl-Math-GMPz.info index 8442068184..2d25752a1a 100644 --- a/perl/perl-Math-GMPz/perl-Math-GMPz.info +++ b/perl/perl-Math-GMPz/perl-Math-GMPz.info @@ -1,8 +1,8 @@ PRGNAM="perl-Math-GMPz" -VERSION="0.49" +VERSION="0.50" HOMEPAGE="https://metacpan.org/pod/Math::GMPz" -DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SI/SISYPHUS/Math-GMPz-0.49.tar.gz" -MD5SUM="50ca3fb416c9696be26cff992db2e2e4" +DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SI/SISYPHUS/Math-GMPz-0.50.tar.gz" +MD5SUM="ee9853d2721682d9faea7b366abebad4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/perl/perl-Sidef/perl-Sidef.SlackBuild b/perl/perl-Sidef/perl-Sidef.SlackBuild index 2f7756cb93..51d2eef2ee 100644 --- a/perl/perl-Sidef/perl-Sidef.SlackBuild +++ b/perl/perl-Sidef/perl-Sidef.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=perl-Sidef -VERSION=${VERSION:-3.97.1} +VERSION=${VERSION:-3.98} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/perl/perl-Sidef/perl-Sidef.info b/perl/perl-Sidef/perl-Sidef.info index 3379b96b7b..a7b76cf17f 100644 --- a/perl/perl-Sidef/perl-Sidef.info +++ b/perl/perl-Sidef/perl-Sidef.info @@ -1,8 +1,8 @@ PRGNAM="perl-Sidef" -VERSION="3.97.1" +VERSION="3.98" HOMEPAGE="https://github.com/trizen/sidef" -DOWNLOAD="https://github.com/trizen/sidef/archive/3.97.1/sidef-3.97.1.tar.gz" -MD5SUM="9d7e6dc6aca6c9d4c9450baf62bb7cb9" +DOWNLOAD="https://github.com/trizen/sidef/archive/3.98/sidef-3.98.tar.gz" +MD5SUM="3d17c75d3b298f1322bcbbccddba6d06" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-data-dump perl-Module-Build perl-Math-MPC perl-Math-Prime-Util-GMP perl-Algorithm-Combinatorics perl-Algorithm-Loops perl-Math-Prime-Util" diff --git a/python/decorator/decorator.SlackBuild b/python/decorator/decorator.SlackBuild index 30c94b4882..f734e04f93 100644 --- a/python/decorator/decorator.SlackBuild +++ b/python/decorator/decorator.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=decorator -VERSION=${VERSION:-5.0.5} +VERSION=${VERSION:-5.0.7} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} diff --git a/python/decorator/decorator.info b/python/decorator/decorator.info index e2f91a2a2e..6d45f491b2 100644 --- a/python/decorator/decorator.info +++ b/python/decorator/decorator.info @@ -1,8 +1,8 @@ PRGNAM="decorator" -VERSION="5.0.5" +VERSION="5.0.7" HOMEPAGE="https://pypi.python.org/pypi/decorator" -DOWNLOAD="https://files.pythonhosted.org/packages/source/d/decorator/decorator-5.0.5.tar.gz" -MD5SUM="769d96549a076f6bdcf0c730797f58f1" +DOWNLOAD="https://files.pythonhosted.org/packages/source/d/decorator/decorator-5.0.7.tar.gz" +MD5SUM="c35b2a3446478986e91b15ad1626e152" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3" diff --git a/python/internetarchive/internetarchive.SlackBuild b/python/internetarchive/internetarchive.SlackBuild index 46539d5d88..d6d19e913b 100644 --- a/python/internetarchive/internetarchive.SlackBuild +++ b/python/internetarchive/internetarchive.SlackBuild @@ -23,9 +23,10 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=internetarchive -VERSION=${VERSION:-1.9.9} +VERSION=${VERSION:-2.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -38,6 +39,7 @@ CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" diff --git a/python/internetarchive/internetarchive.info b/python/internetarchive/internetarchive.info index c8746a35dd..4571deb719 100644 --- a/python/internetarchive/internetarchive.info +++ b/python/internetarchive/internetarchive.info @@ -1,8 +1,8 @@ PRGNAM="internetarchive" -VERSION="1.9.9" +VERSION="2.0.1" HOMEPAGE="https://github.com/jjjake/internetarchive" -DOWNLOAD="https://github.com/jjjake/internetarchive/archive/v1.9.9/internetarchive-1.9.9.tar.gz" -MD5SUM="f3db9d496ba5d554e0a824c84e394c13" +DOWNLOAD="https://github.com/jjjake/internetarchive/archive/v2.0.1/internetarchive-2.0.1.tar.gz" +MD5SUM="cd546a46d513990d7f9b175f746ed6af" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="docopt python-requests python3-six schema tqdm" diff --git a/python/python-neovim/python-neovim.SlackBuild b/python/python-neovim/python-neovim.SlackBuild index 29dff88b89..e01ee18a50 100644 --- a/python/python-neovim/python-neovim.SlackBuild +++ b/python/python-neovim/python-neovim.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python-neovim -# Copyright 2017-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=python-neovim SRCNAM=pynvim -VERSION=${VERSION:-0.4.1} +VERSION=${VERSION:-0.4.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/python/python-neovim/python-neovim.info b/python/python-neovim/python-neovim.info index a5186720a7..f1988f3725 100644 --- a/python/python-neovim/python-neovim.info +++ b/python/python-neovim/python-neovim.info @@ -1,8 +1,8 @@ PRGNAM="python-neovim" -VERSION="0.4.1" +VERSION="0.4.3" HOMEPAGE="https://neovim.io" -DOWNLOAD="https://github.com/neovim/pynvim/archive/0.4.1/pynvim-0.4.1.tar.gz" -MD5SUM="8d90f9f29b2cdaf6adfc78b0eda9dd20" +DOWNLOAD="https://github.com/neovim/pynvim/archive/0.4.3/pynvim-0.4.3.tar.gz" +MD5SUM="b7370a5b3d2177d2b97ca48695ba1ae3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="greenlet msgpack-python trollius pytest-runner" diff --git a/python/python-prometheus_client/python-prometheus_client.SlackBuild b/python/python-prometheus_client/python-prometheus_client.SlackBuild index ca535d2996..da63341d8a 100644 --- a/python/python-prometheus_client/python-prometheus_client.SlackBuild +++ b/python/python-prometheus_client/python-prometheus_client.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=python-prometheus_client SRCNAM=client_python -VERSION=${VERSION:-0.10.0} +VERSION=${VERSION:-0.10.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/python/python-prometheus_client/python-prometheus_client.info b/python/python-prometheus_client/python-prometheus_client.info index 579d2898c7..dea6ab8ea1 100644 --- a/python/python-prometheus_client/python-prometheus_client.info +++ b/python/python-prometheus_client/python-prometheus_client.info @@ -1,8 +1,8 @@ PRGNAM="python-prometheus_client" -VERSION="0.10.0" +VERSION="0.10.1" HOMEPAGE="https://prometheus.io/" -DOWNLOAD="https://github.com/prometheus/client_python/archive/v0.10.0/client_python-0.10.0.tar.gz" -MD5SUM="32203a54490182bb1035d67adebba33e" +DOWNLOAD="https://github.com/prometheus/client_python/archive/v0.10.1/client_python-0.10.1.tar.gz" +MD5SUM="eebf2eb36546ae6127f48842fb230611" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3" diff --git a/python/python3-aiohttp/python3-aiohttp.SlackBuild b/python/python3-aiohttp/python3-aiohttp.SlackBuild index 2e6d8618a5..c5b8149913 100644 --- a/python/python3-aiohttp/python3-aiohttp.SlackBuild +++ b/python/python3-aiohttp/python3-aiohttp.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=python3-aiohttp -VERSION=${VERSION:-3.7.4} +VERSION=${VERSION:-3.7.4.post0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/python/python3-aiohttp/python3-aiohttp.info b/python/python3-aiohttp/python3-aiohttp.info index 3f52c04839..aba2ee4ee4 100644 --- a/python/python3-aiohttp/python3-aiohttp.info +++ b/python/python3-aiohttp/python3-aiohttp.info @@ -1,8 +1,8 @@ PRGNAM="python3-aiohttp" -VERSION="3.7.4" +VERSION="3.7.4.post0" HOMEPAGE="https://aiohttp.readthedocs.io/en/stable/" -DOWNLOAD="https://github.com/aio-libs/aiohttp/archive/v3.7.4/aiohttp-3.7.4.tar.gz" -MD5SUM="024c67c8e6ba529e11d7486411cc3cda" +DOWNLOAD="https://github.com/aio-libs/aiohttp/archive/v3.7.4.post0/aiohttp-3.7.4.post0.tar.gz" +MD5SUM="d643e1dcbb79acd27aaaa9af3fc1e210" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gunicorn async-timeout python3-attrs yarl python-chardet typing-extensions" diff --git a/python/python3-astroid/python3-astroid.SlackBuild b/python/python3-astroid/python3-astroid.SlackBuild index 0daef9499b..f4bc841788 100644 --- a/python/python3-astroid/python3-astroid.SlackBuild +++ b/python/python3-astroid/python3-astroid.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=python3-astroid SRCNAM=astroid -VERSION=${VERSION:-2.5.2} +VERSION=${VERSION:-2.5.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/python/python3-astroid/python3-astroid.info b/python/python3-astroid/python3-astroid.info index 4357c81d1f..299fe9a3a4 100644 --- a/python/python3-astroid/python3-astroid.info +++ b/python/python3-astroid/python3-astroid.info @@ -1,8 +1,8 @@ PRGNAM="python3-astroid" -VERSION="2.5.2" +VERSION="2.5.3" HOMEPAGE="https://github.com/PyCQA/astroid" -DOWNLOAD="https://files.pythonhosted.org/packages/7b/92/1fe4e6cbd476f33658b854f3bae8e7230481ac0e4f2758385b3a5cd05fe7/astroid-2.5.2.tar.gz" -MD5SUM="38c7176fbb623c28a99e398a5d896f39" +DOWNLOAD="https://files.pythonhosted.org/packages/43/2d/f10df6489391a534db45e809d78d1427828c72b851824cf4aa5b7539648d/astroid-2.5.3.tar.gz" +MD5SUM="f10e7c2a8f4100ba4ab1451c0ada6dd2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-lazy-object-proxy python3-wrapt typed_ast" diff --git a/python/python3-ptyprocess/python3-ptyprocess.SlackBuild b/python/python3-ptyprocess/python3-ptyprocess.SlackBuild index aa6d21afb4..4b2e723f00 100644 --- a/python/python3-ptyprocess/python3-ptyprocess.SlackBuild +++ b/python/python3-ptyprocess/python3-ptyprocess.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for python3-ptyprocess # Copyright 2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org> -# Copyright 2017-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=python3-ptyprocess -VERSION=${VERSION:-0.6.0} +VERSION=${VERSION:-0.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/python/python3-ptyprocess/python3-ptyprocess.info b/python/python3-ptyprocess/python3-ptyprocess.info index ec991c5489..e3978b246e 100644 --- a/python/python3-ptyprocess/python3-ptyprocess.info +++ b/python/python3-ptyprocess/python3-ptyprocess.info @@ -1,8 +1,8 @@ PRGNAM="python3-ptyprocess" -VERSION="0.6.0" +VERSION="0.7.0" HOMEPAGE="https://pypi.python.org/pypi/ptyprocess" -DOWNLOAD="https://files.pythonhosted.org/packages/source/p/ptyprocess/ptyprocess-0.6.0.tar.gz" -MD5SUM="37402d69f3b50913d4d483587bffad8f" +DOWNLOAD="https://files.pythonhosted.org/packages/source/p/ptyprocess/ptyprocess-0.7.0.tar.gz" +MD5SUM="9da200c397cb1752209a6b718b6cfc68" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3" diff --git a/python/python3-seaborn/python3-seaborn.SlackBuild b/python/python3-seaborn/python3-seaborn.SlackBuild index 24db23459a..a3b9c72a27 100644 --- a/python/python3-seaborn/python3-seaborn.SlackBuild +++ b/python/python3-seaborn/python3-seaborn.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for python3-seaborn -# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.com> +# Copyright 2020-2021 Isaac Yu <isaacyu1@isaacyu1.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,11 +23,12 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=python3-seaborn -VERSION=${VERSION:-0.10.1} -SRCNAM=seaborn +VERSION=${VERSION:-0.11.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +SRCNAM=seaborn + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; diff --git a/python/python3-seaborn/python3-seaborn.info b/python/python3-seaborn/python3-seaborn.info index 65cec7b38a..b2adaafd8b 100644 --- a/python/python3-seaborn/python3-seaborn.info +++ b/python/python3-seaborn/python3-seaborn.info @@ -1,8 +1,8 @@ PRGNAM="python3-seaborn" -VERSION="0.10.1" +VERSION="0.11.1" HOMEPAGE="https://seaborn.pydata.org/" -DOWNLOAD="https://github.com/mwaskom/seaborn/archive/v0.10.1/seaborn-0.10.1.tar.gz" -MD5SUM="125586d58ef64fb47199d4eae71cbd69" +DOWNLOAD="https://github.com/mwaskom/seaborn/archive/v0.11.1/seaborn-0.11.1.tar.gz" +MD5SUM="6fd7c297d708044439bde6997c96402c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-matplotlib python3-pandas scipy3" diff --git a/python/scikit-learn/scikit-learn.SlackBuild b/python/scikit-learn/scikit-learn.SlackBuild index aa7adf86ff..476f13ccb8 100644 --- a/python/scikit-learn/scikit-learn.SlackBuild +++ b/python/scikit-learn/scikit-learn.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=scikit-learn -VERSION=${VERSION:-0.24.0} +VERSION=${VERSION:-0.24.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/python/scikit-learn/scikit-learn.info b/python/scikit-learn/scikit-learn.info index 2af105a3f6..455e06fdc2 100644 --- a/python/scikit-learn/scikit-learn.info +++ b/python/scikit-learn/scikit-learn.info @@ -1,8 +1,8 @@ PRGNAM="scikit-learn" -VERSION="0.24.0" +VERSION="0.24.1" HOMEPAGE="https://scikit-learn.org" -DOWNLOAD="https://github.com/scikit-learn/scikit-learn/archive/0.24.0/scikit-learn-0.24.0.tar.gz" -MD5SUM="cb185348d240a2a851191ba2ef4c816e" +DOWNLOAD="https://github.com/scikit-learn/scikit-learn/archive/0.24.1/scikit-learn-0.24.1.tar.gz" +MD5SUM="a396b295ed76979577279bee9310acc4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python-joblib python3-Cython scipy3" diff --git a/python/typed_ast/typed_ast.SlackBuild b/python/typed_ast/typed_ast.SlackBuild index 1bbae3003e..2d9917d89b 100644 --- a/python/typed_ast/typed_ast.SlackBuild +++ b/python/typed_ast/typed_ast.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=typed_ast -VERSION=${VERSION:-1.4.2} +VERSION=${VERSION:-1.4.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/python/typed_ast/typed_ast.info b/python/typed_ast/typed_ast.info index 89bc8b538f..387f668053 100644 --- a/python/typed_ast/typed_ast.info +++ b/python/typed_ast/typed_ast.info @@ -1,8 +1,8 @@ PRGNAM="typed_ast" -VERSION="1.4.2" +VERSION="1.4.3" HOMEPAGE="https://github.com/python/typed_ast" -DOWNLOAD="https://github.com/python/typed_ast/archive/1.4.2/typed_ast-1.4.2.tar.gz" -MD5SUM="bcb88fa40ffab2bfe59a5473cd5c5dc5" +DOWNLOAD="https://github.com/python/typed_ast/archive/1.4.3/typed_ast-1.4.3.tar.gz" +MD5SUM="de94287e7fa3f1f44a4acacfe725e51a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3" diff --git a/system/android-file-transfer/README b/system/android-file-transfer/README index a2ec55f725..a0b712341a 100644 --- a/system/android-file-transfer/README +++ b/system/android-file-transfer/README @@ -1,8 +1,10 @@ Android File Transfer for Linux - reliable MTP client with minimalistic UI similar to Android File Transfer for Mac. -Android File Transfer by default builds qt4 ui (or qt5, -if installed). However, in building only the client, -without ui, run the script with the following command: +Android File Transfer by default builds qt5 ui. This version +of Android File Transfer does not support qt4 ui. + +In building only the command-line client (this does not require +qt5), run the script with the following command: QT_GUI=no ./android-file-transfer.SlackBuild diff --git a/system/android-file-transfer/android-file-transfer.SlackBuild b/system/android-file-transfer/android-file-transfer.SlackBuild index 809af5be97..07699f3c7d 100644 --- a/system/android-file-transfer/android-file-transfer.SlackBuild +++ b/system/android-file-transfer/android-file-transfer.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for android-file-transfer # -# Copyright 2019 Isaac Yu <isaacyu1@isaacyu1.com> +# Copyright 2019-2021 Isaac Yu <isaacyu1@isaacyu1.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=android-file-transfer -VERSION=${VERSION:-3.9} +VERSION=${VERSION:-4.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -81,9 +81,9 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DCMAKE_BUILD_TYPE=Release .. \ - -DBUILD_QT_UI=$GUI + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DBUILD_QT_UI=$GUI \ + -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG cd .. diff --git a/system/android-file-transfer/android-file-transfer.info b/system/android-file-transfer/android-file-transfer.info index e2ec031b1b..256a032663 100644 --- a/system/android-file-transfer/android-file-transfer.info +++ b/system/android-file-transfer/android-file-transfer.info @@ -1,10 +1,10 @@ PRGNAM="android-file-transfer" -VERSION="3.9" +VERSION="4.2" HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux" -DOWNLOAD="https://github.com/whoozle/android-file-transfer-linux/archive/v3.9/android-file-transfer-3.9.tar.gz" -MD5SUM="84c28538f03802a3f0dda71e53564034" +DOWNLOAD="https://github.com/whoozle/android-file-transfer-linux/archive/v4.2/android-file-transfer-4.2.tar.gz" +MD5SUM="861de28c87f095a32808d0cbf9bb897a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="qt5" MAINTAINER="Isaac Yu" EMAIL="isaacyu1@isaacyu1.com" diff --git a/system/ansible/ansible.SlackBuild b/system/ansible/ansible.SlackBuild index bb0f5e4a09..f5043880e4 100644 --- a/system/ansible/ansible.SlackBuild +++ b/system/ansible/ansible.SlackBuild @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ansible -VERSION=${VERSION:-2.9.13} +VERSION=${VERSION:-2.9.20} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/ansible/ansible.info b/system/ansible/ansible.info index 643c9cb987..bd7b3a06ee 100644 --- a/system/ansible/ansible.info +++ b/system/ansible/ansible.info @@ -1,8 +1,8 @@ PRGNAM="ansible" -VERSION="2.9.13" +VERSION="2.9.20" HOMEPAGE="https://www.ansible.com" -DOWNLOAD="https://releases.ansible.com/ansible/ansible-2.9.13.tar.gz" -MD5SUM="3f66cce5bdbfc49315b9f357d36d38c5" +DOWNLOAD="https://releases.ansible.com/ansible/ansible-2.9.20.tar.gz" +MD5SUM="47226da137b30883f166d5543882d66f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cryptography python3-PyYAML Jinja2" diff --git a/system/clamav/clamav.SlackBuild b/system/clamav/clamav.SlackBuild index 4e5251fe0e..79be84db92 100644 --- a/system/clamav/clamav.SlackBuild +++ b/system/clamav/clamav.SlackBuild @@ -180,7 +180,8 @@ install -D -m 0644 $CWD/logrotate.clamav $PKG/etc/logrotate.d/clamav.new # init script must still ensure that /var/run/clamav exists # and has proper ownership and permissions though mkdir -p $PKG/var/lib/clamav $PKG/var/log/clamav $PKG/var/run/clamav -chmod 771 $PKG/var/lib/clamav $PKG/var/log/clamav $PKG/var/run/clamav +chmod 0771 $PKG/var/log/clamav $PKG/var/run/clamav +chmod 0775 $PKG/var/lib/clamav # Fixup some ownership and permissions issues chown -R root:root $PKG @@ -189,14 +190,13 @@ if [ "$milter" = "en" ]; then chown clamav $PKG/usr/sbin/clamav-milter chmod 4700 $PKG/usr/sbin/clamav-milter fi -chmod 0770 $PKG/var/lib/clamav touch $PKG/var/lib/clamav/main.cvd $PKG/var/lib/clamav/daily.cvd chmod 0660 $PKG/var/lib/clamav/* # Create log files in such a way that they won't clobber existing ones touch $PKG/var/log/clamav/clamd.log.new \ $PKG/var/log/clamav/freshclam.log.new -chmod 660 $PKG/var/log/clamav/clamd.log.new \ +chmod 0660 $PKG/var/log/clamav/clamd.log.new \ $PKG/var/log/clamav/freshclam.log.new chown -R clamav:clamav $PKG/var/lib/clamav $PKG/var/log/clamav \ diff --git a/system/execline/execline.SlackBuild b/system/execline/execline.SlackBuild index 890d867bab..1394c1bfd1 100644 --- a/system/execline/execline.SlackBuild +++ b/system/execline/execline.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=execline -VERSION=${VERSION:-2.8.0.0} +VERSION=${VERSION:-2.8.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/execline/execline.info b/system/execline/execline.info index 15c99362c1..4325cd74e9 100644 --- a/system/execline/execline.info +++ b/system/execline/execline.info @@ -1,8 +1,8 @@ PRGNAM="execline" -VERSION="2.8.0.0" +VERSION="2.8.0.1" HOMEPAGE="https://skarnet.org/software/execline/" -DOWNLOAD="https://skarnet.org/software/execline/execline-2.8.0.0.tar.gz" -MD5SUM="b3de6552479ad84ef7d22f98135496a1" +DOWNLOAD="https://skarnet.org/software/execline/execline-2.8.0.1.tar.gz" +MD5SUM="1db2962b05f2566826ad9da4e3b5c475" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="skalibs" diff --git a/system/lxtask/lxtask.SlackBuild b/system/lxtask/lxtask.SlackBuild index 773b8f900d..3856967c99 100644 --- a/system/lxtask/lxtask.SlackBuild +++ b/system/lxtask/lxtask.SlackBuild @@ -51,6 +51,8 @@ # * updated. # 0.1.9-1: 11/mar/2019 by Matteo Bernardini <ponce@slackbuilds.org> # * updated. +# 0.1.10-1: 10/apr/2021 by Matteo Bernardini <ponce@slackbuilds.org> +# * updated. # # Run 'sh lxtask.SlackBuild' to build a Slackware package. # The package is created in /tmp . @@ -59,7 +61,7 @@ # ----------------------------------------------------------------------------- PRGNAM=lxtask -VERSION=${VERSION:-0.1.9} +VERSION=${VERSION:-0.1.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/lxtask/lxtask.info b/system/lxtask/lxtask.info index 80d2cb4154..8e9a1f2b23 100644 --- a/system/lxtask/lxtask.info +++ b/system/lxtask/lxtask.info @@ -1,8 +1,8 @@ PRGNAM="lxtask" -VERSION="0.1.9" +VERSION="0.1.10" HOMEPAGE="https://wiki.lxde.org/en/LXTask" -DOWNLOAD="https://downloads.sf.net/lxde/lxtask-0.1.9.tar.xz" -MD5SUM="f19a9e4d22a075f984681a480f0aa886" +DOWNLOAD="https://downloads.sf.net/lxde/lxtask-0.1.10.tar.xz" +MD5SUM="27b5258847afc237a5b89666e7a8b45b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lxde-common lxpanel" diff --git a/system/lxterminal/lxterminal.SlackBuild b/system/lxterminal/lxterminal.SlackBuild index 5cd1509a1b..ef12fe3f5a 100644 --- a/system/lxterminal/lxterminal.SlackBuild +++ b/system/lxterminal/lxterminal.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # $Id: lxterminal.SlackBuild,v 1.6 2009/09/11 10:43:05 root Exp root $ # Copyright (c) 2008-2009 Eric Hameleers, Eindhoven, NL -# Copyright (c) 2010-2018 Matteo Bernardini, Pisa, IT +# Copyright (c) 2010-2021 Matteo Bernardini, Pisa, IT # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -67,6 +67,8 @@ # * Update. # 0.3.2: 13/oct/2018 by Matteo Bernardini <ponce@slackbuilds.org> # * Update. +# 0.4.0: 10/apr/2021 by Matteo Bernardini <ponce@slackbuilds.org> +# * Update. # # Run 'sh lxterminal.SlackBuild' to build a Slackware package. # The package is created in /tmp . @@ -75,7 +77,7 @@ # ----------------------------------------------------------------------------- PRGNAM=lxterminal -VERSION=${VERSION:-0.3.2} +VERSION=${VERSION:-0.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/lxterminal/lxterminal.info b/system/lxterminal/lxterminal.info index 8f5130af46..d8fecdbf39 100644 --- a/system/lxterminal/lxterminal.info +++ b/system/lxterminal/lxterminal.info @@ -1,8 +1,8 @@ PRGNAM="lxterminal" -VERSION="0.3.2" +VERSION="0.4.0" HOMEPAGE="https://wiki.lxde.org/en/LXTerminal" -DOWNLOAD="http://downloads.sourceforge.net/lxde/lxterminal-0.3.2.tar.xz" -MD5SUM="62e57c3aafb831505cc1638b2b737cc9" +DOWNLOAD="http://downloads.sf.net/lxde/lxterminal-0.4.0.tar.xz" +MD5SUM="7938dbd50e3826c11f4735a742b278d3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/netdata/netdata.SlackBuild b/system/netdata/netdata.SlackBuild index de94ac07bc..ff9a31865c 100644 --- a/system/netdata/netdata.SlackBuild +++ b/system/netdata/netdata.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=netdata -VERSION=${VERSION:-1.30.0} +VERSION=${VERSION:-1.29.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/netdata/netdata.info b/system/netdata/netdata.info index 7e620ff774..95ea1f6c42 100644 --- a/system/netdata/netdata.info +++ b/system/netdata/netdata.info @@ -1,8 +1,8 @@ PRGNAM="netdata" -VERSION="1.30.0" +VERSION="1.29.3" HOMEPAGE="https://github.com/netdata/netdata" -DOWNLOAD="https://github.com/netdata/netdata/archive/v1.30.0/netdata-1.30.0.tar.gz" -MD5SUM="0f4ae6dffcd757c590ca302de2393c73" +DOWNLOAD="https://github.com/netdata/netdata/archive/v1.29.3/netdata-1.29.3.tar.gz" +MD5SUM="9bb47600963c001c7de828e7e2e135a4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="PyYAML libuv" diff --git a/system/newLd/newLd.SlackBuild b/system/newLd/newLd.SlackBuild index 71d3bf1adc..273ea5546c 100644 --- a/system/newLd/newLd.SlackBuild +++ b/system/newLd/newLd.SlackBuild @@ -50,8 +50,6 @@ fi # exit 0 #fi -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - # Set to ld.gold or ld.bfd: DEFAULT_LD=ld.bfd @@ -84,6 +82,8 @@ case "$ARCH" in *) TARGET=$ARCH-slackware-linux ;; esac +set -e + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -92,32 +92,32 @@ mkdir -p $TMP $PKG cd $TMP rm -rf binutils-$VERSION -tar xvf $CWD/binutils-$VERSION.tar.?z || exit 1 -cd binutils-$VERSION || exit 1 +tar xvf $CWD/binutils-$VERSION.tar.?z +cd binutils-$VERSION # Various upstream patches: -zcat $CWD/patches/binutils-2.20.51.0.2-libtool-lib64.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/binutils-2.25-version.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/binutils-2.25-set-long-long.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/binutils-2.20.51.0.10-copy-osabi.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/binutils-2.20.51.0.10-sec-merge-emit.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/binutils-2.24-ldforcele.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/binutils-2.25.1-cleansweep.patch.gz | patch -p2 --verbose || exit 1 +zcat $CWD/patches/binutils-2.20.51.0.2-libtool-lib64.patch.gz | patch -p1 --verbose +zcat $CWD/patches/binutils-2.25-version.patch.gz | patch -p1 --verbose +zcat $CWD/patches/binutils-2.25-set-long-long.patch.gz | patch -p1 --verbose +zcat $CWD/patches/binutils-2.20.51.0.10-copy-osabi.patch.gz | patch -p1 --verbose +zcat $CWD/patches/binutils-2.20.51.0.10-sec-merge-emit.patch.gz | patch -p1 --verbose +zcat $CWD/patches/binutils-2.24-ldforcele.patch.gz | patch -p1 --verbose +zcat $CWD/patches/binutils-2.25.1-cleansweep.patch.gz | patch -p2 --verbose # Export the demangle.h header file: -zcat $CWD/patches/binutils.export.demangle.h.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/patches/binutils.export.demangle.h.diff.gz | patch -p1 --verbose # Don't check to see if "config.h" was included in the installed headers: -zcat $CWD/patches/binutils.no-config-h-check.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/patches/binutils.no-config-h-check.diff.gz | patch -p1 --verbose # Set %version to something halfway meaningful: sed -i -e 's/%''{release}/slack15/g' bfd/Makefile{.am,.in} chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ +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 {} \; # End of preparations if echo "$*" | grep -qw -- --prep ; then @@ -143,8 +143,7 @@ CFLAGS="$SLKCFLAGS" \ --enable-ld=default \ --enable-initfini-array \ $WERROR \ - --build=$TARGET \ - || exit 1 + --build=$TARGET # Use "tooldir=/usr" to avoid internal references to the /usr/${TARGET}/ @@ -155,9 +154,9 @@ CFLAGS="$SLKCFLAGS" \ # been built into the linker for quite some time and the ones in the # filesystem aren't actually loaded. For the most part they are now # documentation and it doesn't matter where they reside. -make clean || exit 1 -make tooldir=$PREFIX $NUMJOBS || make tooldir=$PREFIX || exit 1 -make tooldir=$PREFIX install DESTDIR=$PKG || exit 1 +make clean +make tooldir=$PREFIX +make tooldir=$PREFIX install DESTDIR=$PKG # Using tooldir=/usr also makes the /usr/${TARGET}/lib${LIBDIRSUFFIX} # directory obsolete, and the build will no longer install it. But since @@ -177,7 +176,7 @@ rm -rf $PKG/$PREFIX/$ARCH-slackware-linux # Delete unwanted programs rm -f $PKG/$PREFIX/bin/{addr2line,ar,as,c++filt,dlltool,dllwrap,elfedit,gprof,ld.bfd,nm,objcopy,objdump,ranlib,readelf,size,strings,strip,windmc,windres} - + mkdir -p $PKG/usr/bin cat << EOF > $PKG/usr/bin/ld$VERSION #!/bin/sh @@ -220,8 +219,8 @@ chmod +x $PKG/usr/bin/ld$VERSION # ( cd $PKG/$PREFIX/bin ; rm -f ld ; ln -sf $DEFAULT_LD ld ) #fi -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +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 # Remove some unneeded man pages, and then compress the rest (cd $PKG/usr/man/man1; mv ld.1 ld$VERSION.1) @@ -252,19 +251,8 @@ fi chown -R root:root $PKG/$PREFIX/doc/binutils-$VERSION -# Add slack-desc: mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n /tmp/binutils-$VERSION-$ARCH-$BUILD$TAG.txz - -# Not relation for this package -#cat << EOF -# -############################## -#oprofile links to libbfd so -#be sure to recompile that -############################## -# -#EOF +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/pax/pax.SlackBuild b/system/pax/pax.SlackBuild index 88d9083792..b316863c42 100644 --- a/system/pax/pax.SlackBuild +++ b/system/pax/pax.SlackBuild @@ -10,6 +10,9 @@ # By: Eric Hameleers <alien@slackware.com> # For: pax # Changelog: +# 20201030: 14/Apr/2021 by Ben Collver <bencollver@gmail.com> +# * switch to MirBSD pax +# * removed gpl-2.0.txt # 3.4-2: 17/Sep/2012 by Willy Sudiarto Raharjo <willysr@slackware-id.org> # * Fix build on Slackware 14.0 # 3.4-1: 30/Nov/2008 by Ben Collver <bencollver@gmail.com> @@ -24,13 +27,13 @@ # ----------------------------------------------------------------------------- PRGNAM=pax -VERSION=${VERSION:-3.4} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20201030} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -41,8 +44,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -60,41 +63,32 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION +rm -rf $PRGNAM +tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz +cd $PRGNAM 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -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 {} \; +chmod 755 Build.sh CFLAGS="$SLKCFLAGS -Wno-error" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --build=$ARCH-slackware-linux +./Build.sh -make -make install DESTDIR=$PKG +mkdir -p $PKG/usr/bin $PKG/usr/man/man1 +install -c -s -o root -g bin -m 555 pax $PKG/usr/bin/pax +install -c -o root -g bin -m 444 mans/pax.1 $PKG/usr/man/man1/pax.1 -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +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 -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +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 -cp -a \ - ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README THANKS \ - $PKG/usr/doc/$PRGNAM-$VERSION -chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/* +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/pax/pax.info b/system/pax/pax.info index dd95a443b1..976f2757b7 100644 --- a/system/pax/pax.info +++ b/system/pax/pax.info @@ -1,8 +1,8 @@ PRGNAM="pax" -VERSION="3.4" +VERSION="20201030" HOMEPAGE="http://wiki.bash-hackers.org/howto/pax" -DOWNLOAD="https://downloads.sourceforge.net/project/slackbuildsdirectlinks/pax/pax-3.4.tar.bz2" -MD5SUM="fbd9023b590b45ac3ade95870702a0d6" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/pax_20201030.orig.tar.gz" +MD5SUM="87a0a3870ec437c41eb1b406334fe2c5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/pcmanfm/patches/0001-avoid-undefined-isdigit-behaviour.patch b/system/pcmanfm/patches/0001-avoid-undefined-isdigit-behaviour.patch deleted file mode 100644 index ad9a022db9..0000000000 --- a/system/pcmanfm/patches/0001-avoid-undefined-isdigit-behaviour.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0619a81f358d85568d990fc78c67e121e55f1c05 Mon Sep 17 00:00:00 2001 -From: Michael Weghorn <m.weghorn@posteo.de> -Date: Thu, 27 Dec 2018 11:56:09 +0100 -Subject: [PATCH] Avoid undefined 'isdigit()' behaviour - -As the C11 standard says in section 7.4, 1), -the 'isdigit()' function is only well-defined -under this precondition: - -> The header <ctype.h> declares several functions -> useful for classifying and mapping characters. -> In all cases the argument is an int, the value of -> which shall be representable as an unsigned char or -> shall equal the value of the macro EOF. If the argument -> has any other value, the behavior is undefined. - -Therefore avoid to use the 'isdigit()' function here, -since the Gdk key codes and thus the 'keyval' -member from the 'GdkEventKey' do not always fulfill -this requirement and the behaviour is thus undefined. ---- - NEWS | 5 +++++ - src/main-win.c | 2 +- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/NEWS b/NEWS -index d2e6caa..c5b2285 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,3 +1,8 @@ -+Changes on 1.3.2 since 1.3.1: -+ -+* Fixed case when some keyboard shortcuts stopped working: Alt+Home, Alt+Up. -+ -+ - Changes on 1.3.1 since 1.3.0: - - * Allowed bigger sizes of icons and thumbnails as 256*256 appears to be small -diff --git a/src/main-win.c b/src/main-win.c -index 3907dba..49fc53b 100644 ---- a/src/main-win.c -+++ b/src/main-win.c -@@ -2465,7 +2465,7 @@ static gboolean on_key_press_event(GtkWidget* w, GdkEventKey* evt) - - if(modifier == GDK_MOD1_MASK) /* Alt */ - { -- if(isdigit(evt->keyval)) /* Alt + 0 ~ 9, nth tab */ -+ if(evt->keyval >= '0' && evt->keyval <= '9') /* Alt + 0 ~ 9, nth tab */ - { - int n; - if(evt->keyval == '0') --- -2.1.4 - diff --git a/system/pcmanfm/pcmanfm.SlackBuild b/system/pcmanfm/pcmanfm.SlackBuild index 2785dd5496..07edeac2f5 100644 --- a/system/pcmanfm/pcmanfm.SlackBuild +++ b/system/pcmanfm/pcmanfm.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2006-2009 Chess Griffin <chess@chessgriffin.com> # Copyright 2010 Chris Abela <chris.abela@maltats.com> -# Copyright 2011-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2011-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pcmanfm -VERSION=${VERSION:-1.3.1} +VERSION=${VERSION:-1.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -77,9 +77,6 @@ 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 {} \; -# Apply upstream patches -for i in $CWD/patches/* ; do patch -p1 < $i ; done - sh autogen.sh || true CFLAGS="$SLKCFLAGS" \ diff --git a/system/pcmanfm/pcmanfm.info b/system/pcmanfm/pcmanfm.info index 7cb89e0763..d3546b675e 100644 --- a/system/pcmanfm/pcmanfm.info +++ b/system/pcmanfm/pcmanfm.info @@ -1,8 +1,8 @@ PRGNAM="pcmanfm" -VERSION="1.3.1" +VERSION="1.3.2" HOMEPAGE="https://wiki.lxde.org/en/PCManFM" -DOWNLOAD="https://downloads.sf.net/pcmanfm/pcmanfm-1.3.1.tar.xz" -MD5SUM="d32ad2c9c7c52bff2004bbc120b53420" +DOWNLOAD="https://downloads.sf.net/pcmanfm/pcmanfm-1.3.2.tar.xz" +MD5SUM="ef7c4417d2697ef138d175db7aeae15a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libfm" diff --git a/system/qdirstat/qdirstat.SlackBuild b/system/qdirstat/qdirstat.SlackBuild index c650048ca5..623a675d77 100644 --- a/system/qdirstat/qdirstat.SlackBuild +++ b/system/qdirstat/qdirstat.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qdirstat -VERSION=${VERSION:-1.6.1} +VERSION=${VERSION:-1.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/qdirstat/qdirstat.info b/system/qdirstat/qdirstat.info index b4f7a61f78..20f34ac13d 100644 --- a/system/qdirstat/qdirstat.info +++ b/system/qdirstat/qdirstat.info @@ -1,8 +1,8 @@ PRGNAM="qdirstat" -VERSION="1.6.1" +VERSION="1.7.1" HOMEPAGE="https://github.com/shundhammer/qdirstat/" -DOWNLOAD="https://github.com/shundhammer/qdirstat/archive/1.6.1/qdirstat-1.6.1.tar.gz" -MD5SUM="4cdf3cea0a9c0e7cedbf2ce01cf632ea" +DOWNLOAD="https://github.com/shundhammer/qdirstat/archive/1.7.1/qdirstat-1.7.1.tar.gz" +MD5SUM="551b48dcb8006727166d5b167a2af675" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5" diff --git a/system/s6-linux-init/s6-linux-init.SlackBuild b/system/s6-linux-init/s6-linux-init.SlackBuild index 255451c172..12bf4948a3 100644 --- a/system/s6-linux-init/s6-linux-init.SlackBuild +++ b/system/s6-linux-init/s6-linux-init.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=s6-linux-init -VERSION=${VERSION:-1.0.6.1} +VERSION=${VERSION:-1.0.6.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/s6-linux-init/s6-linux-init.info b/system/s6-linux-init/s6-linux-init.info index 4f41a628b1..2efba226a8 100644 --- a/system/s6-linux-init/s6-linux-init.info +++ b/system/s6-linux-init/s6-linux-init.info @@ -1,8 +1,8 @@ PRGNAM="s6-linux-init" -VERSION="1.0.6.1" +VERSION="1.0.6.2" HOMEPAGE="https://skarnet.org/software/s6-linux-init/" -DOWNLOAD="https://skarnet.org/software/s6-linux-init/s6-linux-init-1.0.6.1.tar.gz" -MD5SUM="f4ade1ea60cedecb156eb48ca73fb7c8" +DOWNLOAD="https://skarnet.org/software/s6-linux-init/s6-linux-init-1.0.6.2.tar.gz" +MD5SUM="8ac36600894f2624eb3a2e9bb440e857" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="s6" diff --git a/system/s6-rc/s6-rc.SlackBuild b/system/s6-rc/s6-rc.SlackBuild index 8a472ef5c1..bbbd9c5755 100644 --- a/system/s6-rc/s6-rc.SlackBuild +++ b/system/s6-rc/s6-rc.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=s6-rc -VERSION=${VERSION:-0.5.2.1} +VERSION=${VERSION:-0.5.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/s6-rc/s6-rc.info b/system/s6-rc/s6-rc.info index d5fa325138..7fec7a8ac7 100644 --- a/system/s6-rc/s6-rc.info +++ b/system/s6-rc/s6-rc.info @@ -1,8 +1,8 @@ PRGNAM="s6-rc" -VERSION="0.5.2.1" +VERSION="0.5.2.2" HOMEPAGE="https://skarnet.org/software/s6-rc/" -DOWNLOAD="https://skarnet.org/software/s6-rc/s6-rc-0.5.2.1.tar.gz" -MD5SUM="0fbee215343fda8ccdfcc4c9817d18ff" +DOWNLOAD="https://skarnet.org/software/s6-rc/s6-rc-0.5.2.2.tar.gz" +MD5SUM="1e003badbde728137170775806c6776b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="s6" diff --git a/system/s6/s6.SlackBuild b/system/s6/s6.SlackBuild index 3b95a4c700..7bf12235fe 100644 --- a/system/s6/s6.SlackBuild +++ b/system/s6/s6.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=s6 -VERSION=${VERSION:-2.10.0.2} +VERSION=${VERSION:-2.10.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/s6/s6.info b/system/s6/s6.info index 153415462a..d17ff68653 100644 --- a/system/s6/s6.info +++ b/system/s6/s6.info @@ -1,8 +1,8 @@ PRGNAM="s6" -VERSION="2.10.0.2" +VERSION="2.10.0.3" HOMEPAGE="https://skarnet.org/software/s6/" -DOWNLOAD="https://skarnet.org/software/s6/s6-2.10.0.2.tar.gz" -MD5SUM="f856c571f7cbbf1ec10cbb948a1c365b" +DOWNLOAD="https://skarnet.org/software/s6/s6-2.10.0.3.tar.gz" +MD5SUM="c3956a7c46522e4eea3bf89634d29f88" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="skalibs execline" diff --git a/system/telegraf/telegraf.SlackBuild b/system/telegraf/telegraf.SlackBuild index 316d96e314..6fecbd774f 100644 --- a/system/telegraf/telegraf.SlackBuild +++ b/system/telegraf/telegraf.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=telegraf -VERSION=${VERSION:-1.18.0} +VERSION=${VERSION:-1.18.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/telegraf/telegraf.info b/system/telegraf/telegraf.info index cf8965a0e0..92f01bc041 100644 --- a/system/telegraf/telegraf.info +++ b/system/telegraf/telegraf.info @@ -1,10 +1,10 @@ PRGNAM="telegraf" -VERSION="1.18.0" +VERSION="1.18.1" HOMEPAGE="https://www.influxdata.com" -DOWNLOAD="https://dl.influxdata.com/telegraf/releases/telegraf-1.18.0_linux_i386.tar.gz" -MD5SUM="69fadf1bf0132f9ff1e64ca4c52cb6ea" -DOWNLOAD_x86_64="https://dl.influxdata.com/telegraf/releases/telegraf-1.18.0_linux_amd64.tar.gz" -MD5SUM_x86_64="91ff4f2b8a6c623fb8733843f1e3d455" +DOWNLOAD="https://dl.influxdata.com/telegraf/releases/telegraf-1.18.1_linux_i386.tar.gz" +MD5SUM="5c5fa71a4c28be188604727ee06e7704" +DOWNLOAD_x86_64="https://dl.influxdata.com/telegraf/releases/telegraf-1.18.1_linux_amd64.tar.gz" +MD5SUM_x86_64="a7bb19afa8fcbf3144129f5fb45d559f" REQUIRES="" MAINTAINER="Ebben Aries" EMAIL="slackbuilds@dscp.org" diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild index 8bcb1853b5..da0da96bc8 100644 --- a/system/wine-staging/wine-staging.SlackBuild +++ b/system/wine-staging/wine-staging.SlackBuild @@ -32,8 +32,8 @@ # Now maintained by Dave Woodfall <dave@slackbuilds.org> PRGNAM=wine-staging -VERSION=${VERSION:-6.0} -WINEVERSION=${WINEVERSION:-6.0} +VERSION=${VERSION:-6.5} +WINEVERSION=${WINEVERSION:-6.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/wine-staging/wine-staging.info b/system/wine-staging/wine-staging.info index 8bd895f0d6..520f7c2dfb 100644 --- a/system/wine-staging/wine-staging.info +++ b/system/wine-staging/wine-staging.info @@ -1,10 +1,10 @@ PRGNAM="wine-staging" -VERSION="6.0" +VERSION="6.5" HOMEPAGE="https://wiki.winehq.org/Wine-Staging" -DOWNLOAD="https://dl.winehq.org/wine/source/6.0/wine-6.0.tar.xz \ - https://github.com/wine-staging/wine-staging/archive/v6.0/wine-staging-6.0.tar.gz" -MD5SUM="1c8b7e1642a9e532106b88a7b1932ef3 \ - 1c1c78c356abc0b1da925f410c38ca2b" +DOWNLOAD="https://dl.winehq.org/wine/source/6.x/wine-6.5.tar.xz \ + https://github.com/wine-staging/wine-staging/archive/v6.5/wine-staging-6.5.tar.gz" +MD5SUM="ff2e13ce3cfce10ab801bbe89261d76b \ + 34ee330a274bec7ad5cb7ab840f424fc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |