diff --git a/README b/README index b82837404b3..e86a93e34c7 100644 --- a/README +++ b/README @@ -1,3 +1,19 @@ +SBo-git - slackbuilds repository for slackware-current +- - - + +this is an unofficial fork of master branch from slackbuilds.org's +git repository (http://slackbuilds.org/cgit/slackbuilds/). + +here I put my unofficial mods to their slackbuilds to run on +slackware-current with sbopkg (http://www.sbopkg.org). + +Check https://github.com/Ponce/slackbuilds/wiki for additional informations. + +See https://github.com/Ponce/slackbuilds/wiki/configuring-the-current-repository-with-sbopkg +for instructions on how to use this repository with sbopkg. + +original README from slackbuilds.org follows: +--------------------------------------------- See https://slackbuilds.org/howto/ for instructions on how to use the contents of this directory. diff --git a/academic/EMBASSY/EMBASSY.SlackBuild b/academic/EMBASSY/EMBASSY.SlackBuild index 337de5f778d..198554a4f3a 100644 --- a/academic/EMBASSY/EMBASSY.SlackBuild +++ b/academic/EMBASSY/EMBASSY.SlackBuild @@ -295,6 +295,9 @@ make install DESTDIR=$PKG # Build MSE cd $TMP/$PRGNAM-$VERSION/$MSE +# Use sed to fix the ncurses issue in mse.c +sed -i 's/Display->_maxx/COLS/' src/mse.c || exit 1 +sed -i 's/Display->_maxy/LINES/' src/mse.c || exit 1 CFLAGS="$SLKCFLAGS $LIBDIRPATH" \ CXXFLAGS="$SLKCFLAGS $LIBDIRPATH" \ LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}/EMBOSS" \ diff --git a/academic/WordNet/WordNet.SlackBuild b/academic/WordNet/WordNet.SlackBuild index 2ea227a8dbd..d8883647687 100644 --- a/academic/WordNet/WordNet.SlackBuild +++ b/academic/WordNet/WordNet.SlackBuild @@ -104,7 +104,7 @@ CXXFLAGS="$SLKCFLAGS" \ --datadir=/usr/share/wordnet \ --build=$ARCH-slackware-linux -make CFLAGS="$CFLAGS -DUSE_INTERP_RESULT" +make CFLAGS="$CFLAGS -DUSE_INTERP_RESULT -std=c89" make install-strip DESTDIR=$PKG gzip -9 $PKG/usr/man/man*/* diff --git a/academic/bedtools/bedtools.SlackBuild b/academic/bedtools/bedtools.SlackBuild index 78b678111f8..19307cc2869 100644 --- a/academic/bedtools/bedtools.SlackBuild +++ b/academic/bedtools/bedtools.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=bedtools DIRNAM=bedtools2 -VERSION=${VERSION:-2.31.0} +VERSION=${VERSION:-2.31.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/academic/bedtools/bedtools.info b/academic/bedtools/bedtools.info index 31f2e1b4dad..ceec5617fdb 100644 --- a/academic/bedtools/bedtools.info +++ b/academic/bedtools/bedtools.info @@ -1,8 +1,8 @@ PRGNAM="bedtools" -VERSION="2.31.0" +VERSION="2.31.1" HOMEPAGE="http://bedtools.readthedocs.org/" -DOWNLOAD="https://github.com/arq5x/bedtools2/releases/download/v2.31.0/bedtools-2.31.0.tar.gz" -MD5SUM="d840193968e345947b076eaa322a9420" +DOWNLOAD="https://github.com/arq5x/bedtools2/releases/download/v2.31.1/bedtools-2.31.1.tar.gz" +MD5SUM="d1eb463c07c0753a4ee3af614b2ae387" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/academic/cutadapt/cutadapt.SlackBuild b/academic/cutadapt/cutadapt.SlackBuild index eb103094cd7..83f072bc8db 100644 --- a/academic/cutadapt/cutadapt.SlackBuild +++ b/academic/cutadapt/cutadapt.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cutadapt -VERSION=${VERSION:-1.14} +VERSION=${VERSION:-4.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -85,7 +85,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGES.rst CITATION LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGES.rst LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/academic/cutadapt/cutadapt.info b/academic/cutadapt/cutadapt.info index 9feb6e2217b..227845b459c 100644 --- a/academic/cutadapt/cutadapt.info +++ b/academic/cutadapt/cutadapt.info @@ -1,8 +1,8 @@ PRGNAM="cutadapt" -VERSION="1.14" +VERSION="4.9" HOMEPAGE="https://pypi.python.org/pypi/cutadapt/" -DOWNLOAD="https://pypi.python.org/packages/16/e3/06b45eea35359833e7c6fac824b604f1551c2fc7ba0f2bd318d8dd883eb9/cutadapt-1.14.tar.gz" -MD5SUM="57403c3794aa940699df3032a5e9b208" +DOWNLOAD="https://files.pythonhosted.org/packages/cb/15/85799e7fa1dfb86b8f79f8f98902b28003a054c46447a0580f21e535dbf3/cutadapt-4.9.tar.gz" +MD5SUM="8642bd2807ab04cb6207e6c72f595a6d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="xopen" diff --git a/academic/labplot2/README b/academic/labplot2/README deleted file mode 100644 index 11b9ca74306..00000000000 --- a/academic/labplot2/README +++ /dev/null @@ -1,23 +0,0 @@ -labplot2 (interactive graphing and analysis of scientific data) - -LabPlot is a KDE-application for interactive graphing and analysis of -scientific data. - -LabPlot provides an easy way to create, manage and edit plots. It -allows you to produce plots based on data from a spreadsheet or on -data imported from external files. Plots can be exported to several -pixmap and vector graphic formats. - -LabPlot2 is a complete rewrite of LabPlot1 and lacks in the first -release a lot of features available in the predecessor. On the other -hand, the GUI and the usability is more superior as compared to -LabPlot1 and there are several new features that were not available -in LabPlot1. - -optional dependencies: - -- hdf5 -- netcdf -- cfitsio -- matio -- discount diff --git a/academic/labplot2/doinst.sh b/academic/labplot2/doinst.sh deleted file mode 100644 index 4f83cde3905..00000000000 --- a/academic/labplot2/doinst.sh +++ /dev/null @@ -1,14 +0,0 @@ - -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -x /usr/bin/update-mime-database ]; then - /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi diff --git a/academic/labplot2/labplot2.SlackBuild b/academic/labplot2/labplot2.SlackBuild deleted file mode 100644 index 6a491ce1765..00000000000 --- a/academic/labplot2/labplot2.SlackBuild +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/bash -# -# Slackware build script for LabPlot -# Based on the Slackware 15.0 SlackBuild and AUR PKGBUILD for labplot -# -# Copyright 2014-2024, Fellype do Nascimento, Guaratingueta - Brazil -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) -NAME=labplot - -PRGNAM=labplot2 -VERSION=${VERSION:-2.11.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $NAME-$VERSION -tar -xJf $CWD/$NAME-$VERSION.tar.xz -cd $NAME-$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 build -( cd build/ -cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DMAN_INSTALL_DIR=/usr/man \ - -DENABLE_READSTAT=OFF \ - -DENABLE_TESTS=OFF \ - -DLOCAL_DBC_PARSER=OFF \ - -DLOCAL_VECTOR_BLF=OFF \ - .. -make -make install/strip DESTDIR=$PKG -) - -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 - -# no usr/share/doc dir -mkdir -p $PKG/usr/doc -mv $PKG/usr/share/doc/* $PKG/usr/doc -rmdir $PKG/usr/share/doc - -# Leave only one main category in key "Categories" for the .desktop file -sed -i "s:Qt;KDE;Education;Science;Physics;Math;:Science;:" $PKG/usr/share/applications/org.kde.labplot2.desktop - -# Fix permissions in .desktop file -chmod 0644 $PKG/usr/share/applications/org.kde.labplot2.desktop - -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 AUTHORS ChangeLog README.md LICENSES/* \ -$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 -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE - diff --git a/academic/labplot2/labplot2.info b/academic/labplot2/labplot2.info deleted file mode 100644 index bb85132dc64..00000000000 --- a/academic/labplot2/labplot2.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="labplot2" -VERSION="2.11.1" -HOMEPAGE="https://labplot.kde.org/" -DOWNLOAD="https://download.kde.org/stable/labplot/labplot-2.11.1.tar.xz" -MD5SUM="5113391e0eb304974238becfa82c0a70" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Fellype do Nascimento" -EMAIL="fellype (at) gmail (dot) com" diff --git a/academic/labplot2/slack-desc b/academic/labplot2/slack-desc deleted file mode 100644 index 7bd9341d2eb..00000000000 --- a/academic/labplot2/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------------------------------------------------------| -labplot2: labplot2 (interactive graphing and analysis of scientific data) -labplot2: -labplot2: LabPlot is a KDE-application for interactive graphing and analysis of -labplot2: scientific data. LabPlot provides an easy way to create, manage and -labplot2: edit plots. -labplot2: LabPlot2 is a complete rewrite of LabPlot1 and lacks in the first -labplot2: release a lot of features available in the predecessor. On the other -labplot2: hand, the GUI and the usability is more superior as compared to -labplot2: LabPlot1 and there are several new features that were not available -labplot2: in LabPlot1. -labplot2: diff --git a/academic/staden/staden.SlackBuild b/academic/staden/staden.SlackBuild index 4c16f470195..cca4bfe29cf 100644 --- a/academic/staden/staden.SlackBuild +++ b/academic/staden/staden.SlackBuild @@ -81,6 +81,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +sed -i '11i #include ' stops/stops.c + # Make sure libraries path is correct. sed -i "s:$STADENROOT/lib:$STADENROOT/lib${LIBDIRSUFFIX}:g" \ global.mk staden.profile diff --git a/academic/stellarium/stellarium.SlackBuild b/academic/stellarium/stellarium.SlackBuild index fa3ce9900c3..18b68389b15 100644 --- a/academic/stellarium/stellarium.SlackBuild +++ b/academic/stellarium/stellarium.SlackBuild @@ -122,6 +122,7 @@ cd build -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_MANDIR=/usr/man \ + -DPREFER_SYSTEM_INDILIB=NO \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/academic/stellarsolver/README b/academic/stellarsolver/README deleted file mode 100644 index 7bf9e1a0877..00000000000 --- a/academic/stellarsolver/README +++ /dev/null @@ -1,11 +0,0 @@ -stellarsolver Astrometric Plate Solver - -stellarsolver is a cross platform SEP-based star extractor and -astrometry.net-based internal astrometric solver. Also refered to as -Plate solving or Astrometric calibration of an astronomical image, -this is a technique used in astronomy and applied on celestial images. -the astrometric solution it is possible to calculate the celestial -coordinates of any object on the image or synchronize the telescope -mount or satellite pointing position to the center of the image taken. - -stellarsolver is required to compile Kstars with INDI support. diff --git a/academic/stellarsolver/doinst.sh b/academic/stellarsolver/doinst.sh deleted file mode 100644 index 19b813d0223..00000000000 --- a/academic/stellarsolver/doinst.sh +++ /dev/null @@ -1,7 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 -fi diff --git a/academic/stellarsolver/slack-desc b/academic/stellarsolver/slack-desc deleted file mode 100644 index c56b7376e3b..00000000000 --- a/academic/stellarsolver/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------------------------------------------------------| -stellarsolver: stellarsolver (Astrometric Plate Solver) -stellarsolver: -stellarsolver: stellarsolver is a cross platform SEP-based star extractor and -stellarsolver: astrometry.net-based internal astrometric solver. -stellarsolver: -stellarsolver: -stellarsolver: -stellarsolver: https://github.com/rlancaste/stellarsolver -stellarsolver: -stellarsolver: -stellarsolver: diff --git a/academic/stellarsolver/stellarsolver.SlackBuild b/academic/stellarsolver/stellarsolver.SlackBuild deleted file mode 100644 index 8dec189d673..00000000000 --- a/academic/stellarsolver/stellarsolver.SlackBuild +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/bash - -# Slackware build script for stellarsolver - -# Copyright 2022 Edward W. Koenig, Vancouver, WA, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=stellarsolver -VERSION=${VERSION:-2.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -case "$ARCH" in - x86_64) ;; - arm*) ;; - *) echo "Unsupported ARCH '$ARCH'"; exit 1 ;; -esac - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -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 {} \; - -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" -mkdir -p build -cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_TESTER=ON .. - make - make install DESTDIR=$PKG -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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/doinst.sh > $PKG/install/doinst.sh -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/academic/stellarsolver/stellarsolver.info b/academic/stellarsolver/stellarsolver.info deleted file mode 100644 index 106ea0e7cea..00000000000 --- a/academic/stellarsolver/stellarsolver.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="stellarsolver" -VERSION="2.4" -HOMEPAGE="https://github.com/rlancaste/stellarsolver" -DOWNLOAD="UNSUPPORTED" -MD5SUM="" -DOWNLOAD_x86_64="https://github.com/rlancaste/stellarsolver/archive/2.4/stellarsolver-2.4.tar.gz" -MD5SUM_x86_64="a4a92e7c2dc296d7fcbc814134d45886" -REQUIRES="wcslib" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@linuxgalaxy.org" diff --git a/accessibility/flite/flite.SlackBuild b/accessibility/flite/flite.SlackBuild index ee743fdacc9..da0382f8142 100644 --- a/accessibility/flite/flite.SlackBuild +++ b/accessibility/flite/flite.SlackBuild @@ -144,6 +144,7 @@ done # "cd -", as they don't nest. ( cd doc # build the HTML docs. + sed -i -e "s|html/flite\ |html/flite_html |" -e "s|html/flite\;|html/flite_html;|" -e "s|html/flite/|html/flite_html/|" Makefile make $PRGNAM.html ( cd html diff --git a/audio/SuperCollider/SuperCollider.SlackBuild b/audio/SuperCollider/SuperCollider.SlackBuild index 3aca95ac5c6..26ce3bd3364 100644 --- a/audio/SuperCollider/SuperCollider.SlackBuild +++ b/audio/SuperCollider/SuperCollider.SlackBuild @@ -60,6 +60,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +patch -p1 < $CWD/supercollider-3.12.2-libsndfile-110-compat.patch + # Pass AVAHI=yes to the script to enable avahi support if [ "${AVAHI:-no}" = "yes" ]; then avahi="OFF"; else avahi="ON"; fi diff --git a/audio/SuperCollider/supercollider-3.12.2-libsndfile-110-compat.patch b/audio/SuperCollider/supercollider-3.12.2-libsndfile-110-compat.patch new file mode 100644 index 00000000000..321789c2d8c --- /dev/null +++ b/audio/SuperCollider/supercollider-3.12.2-libsndfile-110-compat.patch @@ -0,0 +1,237 @@ +From b9dd70c4c8d61c93d7a70645e0bd18fa76e6834e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marcin=20P=C4=85czkowski?= +Date: Mon, 18 Apr 2022 13:51:53 -0700 +Subject: [PATCH 1/2] libsndfile: use a macro instead of redefining the struct + +Co-Authored-By: Christof Ressi +--- + include/plugin_interface/SC_SndBuf.h | 4 +-- + server/plugins/DiskIO_UGens.cpp | 29 +++++++++++---------- + server/scsynth/SC_HiddenWorld.h | 4 +++ + server/scsynth/SC_SequencedCommand.cpp | 10 +++---- + server/scsynth/SC_World.cpp | 4 +-- + server/supernova/sc/sc_plugin_interface.cpp | 4 +-- + 6 files changed, 30 insertions(+), 25 deletions(-) + +diff --git a/include/plugin_interface/SC_SndBuf.h b/include/plugin_interface/SC_SndBuf.h +index daccfef8438..2cc129edbf9 100644 +--- a/include/plugin_interface/SC_SndBuf.h ++++ b/include/plugin_interface/SC_SndBuf.h +@@ -22,7 +22,7 @@ + + #include + +-typedef struct SNDFILE_tag SNDFILE; ++#define GETSNDFILE(x) ((SNDFILE*)x->sndfile) + + #ifdef SUPERNOVA + +@@ -145,7 +145,7 @@ struct SndBuf { + int mask; // for delay lines + int mask1; // for interpolating oscillators. + int coord; // used by fft ugens +- SNDFILE* sndfile; // used by disk i/o ++ void* sndfile; // used by disk i/o + // SF_INFO fileinfo; // used by disk i/o + #ifdef SUPERNOVA + bool isLocal; +diff --git a/server/plugins/DiskIO_UGens.cpp b/server/plugins/DiskIO_UGens.cpp +index 825d2d52ab3..3ace3ca8ffe 100644 +--- a/server/plugins/DiskIO_UGens.cpp ++++ b/server/plugins/DiskIO_UGens.cpp +@@ -111,7 +111,7 @@ void DiskIOMsg::Perform() { + sf_count_t count; + switch (mCommand) { + case kDiskCmd_Read: +- count = buf->sndfile ? sf_readf_float(buf->sndfile, buf->data + mPos * buf->channels, mFrames) : 0; ++ count = buf->sndfile ? sf_readf_float(GETSNDFILE(buf), buf->data + mPos * buf->channels, mFrames) : 0; + if (count < mFrames) { + memset(buf->data + (mPos + count) * buf->channels, 0, (mFrames - count) * buf->channels * sizeof(float)); + World_GetBuf(mWorld, mBufNum)->mask = mPos + count; +@@ -126,17 +126,17 @@ void DiskIOMsg::Perform() { + memset(buf->data + mPos * buf->channels, 0, mFrames * buf->channels * sizeof(float)); + goto leave; + } +- count = sf_readf_float(buf->sndfile, buf->data + mPos * buf->channels, mFrames); ++ count = sf_readf_float(GETSNDFILE(buf), buf->data + mPos * buf->channels, mFrames); + while (mFrames -= count) { +- sf_seek(buf->sndfile, 0, SEEK_SET); +- count = sf_readf_float(buf->sndfile, buf->data + (mPos + count) * buf->channels, mFrames); ++ sf_seek(GETSNDFILE(buf), 0, SEEK_SET); ++ count = sf_readf_float(GETSNDFILE(buf), buf->data + (mPos + count) * buf->channels, mFrames); + } + break; + case kDiskCmd_Write: + // printf("kDiskCmd_Write %d %p\n", mBufNum, buf->sndfile); + if (!buf->sndfile) + goto leave; +- count = sf_writef_float(buf->sndfile, buf->data + mPos * buf->channels, mFrames); ++ count = sf_writef_float(GETSNDFILE(buf), buf->data + mPos * buf->channels, mFrames); + break; + } + +@@ -287,14 +287,14 @@ void DiskIn_next(DiskIn* unit, int inNumSamples) { + if ((int)ZIN0(1)) { // loop + if (!bufr->sndfile) + memset(bufr->data + mPos * bufr->channels, 0, bufFrames2 * bufr->channels * sizeof(float)); +- count = sf_readf_float(bufr->sndfile, bufr->data + mPos * bufr->channels, bufFrames2); ++ count = sf_readf_float(GETSNDFILE(bufr), bufr->data + mPos * bufr->channels, bufFrames2); + while (bufFrames2 -= count) { +- sf_seek(bufr->sndfile, 0, SEEK_SET); +- count = sf_readf_float(bufr->sndfile, bufr->data + (mPos + count) * bufr->channels, bufFrames2); ++ sf_seek(GETSNDFILE(bufr), 0, SEEK_SET); ++ count = sf_readf_float(GETSNDFILE(bufr), bufr->data + (mPos + count) * bufr->channels, bufFrames2); + } + } else { // non-loop +- count = +- bufr->sndfile ? sf_readf_float(bufr->sndfile, bufr->data + mPos * bufr->channels, bufFrames2) : 0; ++ count = bufr->sndfile ? sf_readf_float(GETSNDFILE(bufr), bufr->data + mPos * bufr->channels, bufFrames2) ++ : 0; + if (count < bufFrames2) { + memset(bufr->data + (mPos + count) * bufr->channels, 0, + (bufFrames2 - count) * bufr->channels * sizeof(float)); +@@ -469,13 +469,14 @@ static void VDiskIn_request_buffer(VDiskIn* unit, float fbufnum, uint32 bufFrame + if ((int)ZIN0(2)) { // loop + if (!bufr->sndfile) + memset(bufr->data + mPos * bufr->channels, 0, bufFrames2 * bufr->channels * sizeof(float)); +- count = sf_readf_float(bufr->sndfile, bufr->data + mPos * bufr->channels, bufFrames2); ++ count = sf_readf_float(GETSNDFILE(bufr), bufr->data + mPos * bufr->channels, bufFrames2); + while (bufFrames2 -= count) { +- sf_seek(bufr->sndfile, 0, SEEK_SET); +- count = sf_readf_float(bufr->sndfile, bufr->data + (mPos + count) * bufr->channels, bufFrames2); ++ sf_seek(GETSNDFILE(bufr), 0, SEEK_SET); ++ count = sf_readf_float(GETSNDFILE(bufr), bufr->data + (mPos + count) * bufr->channels, bufFrames2); + } + } else { // non-loop +- count = bufr->sndfile ? sf_readf_float(bufr->sndfile, bufr->data + mPos * bufr->channels, bufFrames2) : 0; ++ count = ++ bufr->sndfile ? sf_readf_float(GETSNDFILE(bufr), bufr->data + mPos * bufr->channels, bufFrames2) : 0; + if (count < bufFrames2) { + memset(bufr->data + (mPos + count) * bufr->channels, 0, + (bufFrames2 - count) * bufr->channels * sizeof(float)); +diff --git a/server/scsynth/SC_HiddenWorld.h b/server/scsynth/SC_HiddenWorld.h +index 1782ae8e5c4..1f1d924e83d 100644 +--- a/server/scsynth/SC_HiddenWorld.h ++++ b/server/scsynth/SC_HiddenWorld.h +@@ -37,6 +37,10 @@ + + #include "../../common/server_shm.hpp" + ++#ifndef NO_LIBSNDFILE ++# include ++#endif ++ + extern HashTable* gUnitDefLib; + + +diff --git a/server/scsynth/SC_SequencedCommand.cpp b/server/scsynth/SC_SequencedCommand.cpp +index 4227355f3e9..6f54e87a5e4 100644 +--- a/server/scsynth/SC_SequencedCommand.cpp ++++ b/server/scsynth/SC_SequencedCommand.cpp +@@ -375,7 +375,7 @@ bool BufFreeCmd::Stage2() { + mFreeData = buf->data; + #ifndef NO_LIBSNDFILE + if (buf->sndfile) +- sf_close(buf->sndfile); ++ sf_close(GETSNDFILE(buf)); + #endif + SndBuf_Init(buf); + return true; +@@ -600,7 +600,7 @@ bool BufReadCmd::Stage2() { + } + + if (buf->sndfile) +- sf_close(buf->sndfile); ++ sf_close(GETSNDFILE(buf)); + + if (mLeaveFileOpen) { + buf->sndfile = sf; +@@ -903,7 +903,7 @@ bool BufReadChannelCmd::Stage2() { + + leave: + if (buf->sndfile) +- sf_close(buf->sndfile); ++ sf_close(GETSNDFILE(buf)); + + if (mLeaveFileOpen) { + buf->sndfile = sf; +@@ -1014,7 +1014,7 @@ bool BufWriteCmd::Stage2() { + } + + if (buf->sndfile) +- sf_close(buf->sndfile); ++ sf_close(GETSNDFILE(buf)); + + if (mLeaveFileOpen) { + buf->sndfile = sf; +@@ -1057,7 +1057,7 @@ bool BufCloseCmd::Stage2() { + #else + SndBuf* buf = World_GetNRTBuf(mWorld, mBufIndex); + if (buf->sndfile) { +- sf_close(buf->sndfile); ++ sf_close(GETSNDFILE(buf)); + buf->sndfile = nullptr; + } + return true; +diff --git a/server/scsynth/SC_World.cpp b/server/scsynth/SC_World.cpp +index e6ee49023b2..e3de39e4ce2 100644 +--- a/server/scsynth/SC_World.cpp ++++ b/server/scsynth/SC_World.cpp +@@ -968,9 +968,9 @@ void World_Cleanup(World* world, bool unload_plugins) { + + #ifndef NO_LIBSNDFILE + if (nrtbuf->sndfile) +- sf_close(nrtbuf->sndfile); ++ sf_close(GETSNDFILE(nrtbuf)); + if (rtbuf->sndfile && rtbuf->sndfile != nrtbuf->sndfile) +- sf_close(rtbuf->sndfile); ++ sf_close(GETSNDFILE(rtbuf)); + #endif + } + +diff --git a/server/supernova/sc/sc_plugin_interface.cpp b/server/supernova/sc/sc_plugin_interface.cpp +index 0ca778730b4..2a938600a4d 100644 +--- a/server/supernova/sc/sc_plugin_interface.cpp ++++ b/server/supernova/sc/sc_plugin_interface.cpp +@@ -1041,7 +1041,7 @@ void sc_plugin_interface::buffer_close(uint32_t index) { + + if (buf->sndfile == nullptr) + return; +- sf_close(buf->sndfile); ++ sf_close(GETSNDFILE(buf)); + buf->sndfile = nullptr; + } + +@@ -1070,7 +1070,7 @@ void sc_plugin_interface::buffer_sync(uint32_t index) noexcept { + void sc_plugin_interface::free_buffer(uint32_t index) { + SndBuf* buf = world.mSndBufsNonRealTimeMirror + index; + if (buf->sndfile) +- sf_close(buf->sndfile); ++ sf_close(GETSNDFILE(buf)); + + sndbuf_init(buf); + } + +From e93a0c81ca7afdeb69f1aaf5d6167be7e8097f39 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marcin=20P=C4=85czkowski?= +Date: Mon, 18 Apr 2022 16:07:18 -0700 +Subject: [PATCH 2/2] libsndfile: add windows prototypes on additional sndfile + include + +--- + server/scsynth/SC_HiddenWorld.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/server/scsynth/SC_HiddenWorld.h b/server/scsynth/SC_HiddenWorld.h +index 1f1d924e83d..57a26147eb3 100644 +--- a/server/scsynth/SC_HiddenWorld.h ++++ b/server/scsynth/SC_HiddenWorld.h +@@ -38,7 +38,7 @@ + #include "../../common/server_shm.hpp" + + #ifndef NO_LIBSNDFILE +-# include ++# include // includes sndfile.h with appropriate configuration + #endif + + extern HashTable* gUnitDefLib; diff --git a/audio/ardour/ardour.SlackBuild b/audio/ardour/ardour.SlackBuild index 8dfad24c8de..03f2cba2f4f 100644 --- a/audio/ardour/ardour.SlackBuild +++ b/audio/ardour/ardour.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ardour -VERSION=${VERSION:-8.6.0} +VERSION=${VERSION:-8.10.0} MAJVER=$(echo $VERSION | cut -d. -f1) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/audio/ardour/ardour.info b/audio/ardour/ardour.info index 5a1196d197e..a04de25e375 100644 --- a/audio/ardour/ardour.info +++ b/audio/ardour/ardour.info @@ -1,8 +1,8 @@ PRGNAM="ardour" -VERSION="8.6.0" +VERSION="8.10.0" HOMEPAGE="http://ardour.org" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/Ardour-8.6.0.tar.bz2" -MD5SUM="b3f176e79f14988c7b42479214c15184" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/Ardour-8.10.0.tar.bz2" +MD5SUM="e94c8a19dbc91e9c61148232cafb2716" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="aubio jack liblo liblrdf rubberband suil cwiid lilv vst3sdk" diff --git a/audio/deadbeef/deadbeef.SlackBuild b/audio/deadbeef/deadbeef.SlackBuild index 544b0cf46e6..8998573d148 100644 --- a/audio/deadbeef/deadbeef.SlackBuild +++ b/audio/deadbeef/deadbeef.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=deadbeef -VERSION=${VERSION:-1.9.5} +VERSION=${VERSION:-1.9.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -81,6 +81,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ +patch -p1 < $CWD/ffmpeg7.patch + export CC=${CC:-clang} export CXX=${CXX:-clang++} @@ -101,6 +103,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-shared \ --disable-gtk2 \ + --disable-adplug \ --build=$ARCH-slackware-linux make V=1 diff --git a/audio/deadbeef/deadbeef.info b/audio/deadbeef/deadbeef.info index 8af23ad2562..70e13894867 100644 --- a/audio/deadbeef/deadbeef.info +++ b/audio/deadbeef/deadbeef.info @@ -1,8 +1,8 @@ PRGNAM="deadbeef" -VERSION="1.9.5" +VERSION="1.9.6" HOMEPAGE="https://deadbeef.sourceforge.io" -DOWNLOAD="https://downloads.sourceforge.net/deadbeef/deadbeef-1.9.5.tar.bz2" -MD5SUM="5ba1e22a8dc5ff87fcb97e3835dc9b2b" +DOWNLOAD="https://downloads.sourceforge.net/deadbeef/deadbeef-1.9.6.tar.bz2" +MD5SUM="c7dd24ff6fa0f1af23384aabe4236094" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libdispatch" diff --git a/audio/deadbeef/ffmpeg7.patch b/audio/deadbeef/ffmpeg7.patch new file mode 100644 index 00000000000..4cc4c964814 --- /dev/null +++ b/audio/deadbeef/ffmpeg7.patch @@ -0,0 +1,176 @@ +From d4cca5605447122cd080691f43e46047a6039359 Mon Sep 17 00:00:00 2001 +From: Christopher Snowhill +Date: Fri, 21 Jun 2024 21:35:53 -0700 +Subject: [PATCH] ffmpeg: update API to support FFMPEG 7 + +--- + plugins/ffmpeg/ffmpeg.c | 53 ++++++++++++++++++++++++++++++++++------- + 1 file changed, 44 insertions(+), 9 deletions(-) + +diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c +index 97545e987d..69c4e83df8 100644 +--- a/plugins/ffmpeg/ffmpeg.c ++++ b/plugins/ffmpeg/ffmpeg.c +@@ -62,7 +62,7 @@ static int enable_dop = 0; + + typedef struct { + DB_fileinfo_t info; +- AVCodec *codec; ++ const AVCodec *codec; + AVCodecContext *codec_context; + int need_to_free_codec_context; + AVFormatContext *format_context; +@@ -115,12 +115,20 @@ int is_codec_dsd(enum AVCodecID codec_id) { + // ensure that the buffer can contain entire frame of frame_size bytes per channel + static int + ensure_buffer (ffmpeg_info_t *info, size_t frame_size) { ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0) ++ if (!info->buffer || info->buffer_size < frame_size * info->codec_context->ch_layout.nb_channels) { ++#else + if (!info->buffer || info->buffer_size < frame_size * info->codec_context->channels) { ++#endif + if (info->buffer) { + free (info->buffer); + info->buffer = NULL; + } ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0) ++ info->buffer_size = frame_size*info->codec_context->ch_layout.nb_channels; ++#else + info->buffer_size = frame_size*info->codec_context->channels; ++#endif + info->left_in_buffer = 0; + int err = posix_memalign ((void **)&info->buffer, 16, info->buffer_size); + if (err) { +@@ -137,7 +145,7 @@ _get_audio_codec_from_stream(AVFormatContext *format_context, int stream_index, + if (format_context->streams[stream_index]->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) { + return 0; + } +- AVCodec *codec = avcodec_find_decoder(format_context->streams[stream_index]->codecpar->codec_id); ++ const AVCodec *codec = avcodec_find_decoder(format_context->streams[stream_index]->codecpar->codec_id); + if (codec == NULL) { + return 0; + } +@@ -154,7 +162,7 @@ _get_audio_codec_from_stream(AVFormatContext *format_context, int stream_index, + if (ctx == NULL) { + return 0; + } +- AVCodec *codec = avcodec_find_decoder (ctx->codec_id); ++ const AVCodec *codec = avcodec_find_decoder (ctx->codec_id); + if (codec == NULL) { + return 0; + } +@@ -231,7 +239,11 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) { + int bps = av_get_bytes_per_sample (info->codec_context->sample_fmt)*8; + int samplerate = info->codec_context->sample_rate; + ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0) ++ if (bps <= 0 || info->codec_context->ch_layout.nb_channels <= 0 || samplerate <= 0) { ++#else + if (bps <= 0 || info->codec_context->channels <= 0 || samplerate <= 0) { ++#endif + return -1; + } + +@@ -248,7 +260,11 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) { + _info->plugin = &plugin.decoder; + _info->readpos = 0; + _info->fmt.bps = bps; ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0) ++ _info->fmt.channels = info->codec_context->ch_layout.nb_channels; ++#else + _info->fmt.channels = info->codec_context->channels; ++#endif + _info->fmt.samplerate = samplerate; + if (info->codec_context->sample_fmt == AV_SAMPLE_FMT_FLT || info->codec_context->sample_fmt == AV_SAMPLE_FMT_FLTP) { + _info->fmt.is_float = 1; +@@ -296,7 +312,9 @@ _free_info_data(ffmpeg_info_t *info) { + av_packet_unref (&info->pkt); + } + if (info->codec_context) { ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(61, 0, 0) + avcodec_close (info->codec_context); ++#endif + + // The ctx is owned by AVFormatContext in legacy mode + if (info->need_to_free_codec_context) { +@@ -396,7 +414,11 @@ ffmpeg_read (DB_fileinfo_t *_info, char *bytes, int size) { + return -1; + } + ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0) ++ int chCnt = info->codec_context->ch_layout.nb_channels; ++#else + int chCnt = info->codec_context->channels; ++#endif + int chSize = info->pkt.size / chCnt; + uint32_t *pOut = (uint32_t *)info->buffer; + uint8_t marker = 0x05; +@@ -462,25 +484,30 @@ ffmpeg_read (DB_fileinfo_t *_info, char *bytes, int size) { + return -1; + } + if (av_sample_fmt_is_planar(info->codec_context->sample_fmt)) { ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0) ++ int chCnt = info->codec_context->ch_layout.nb_channels; ++#else ++ int chCnt = info->codec_context->channels; ++#endif + out_size = 0; +- for (int c = 0; c < info->codec_context->channels; c++) { ++ for (int c = 0; c < chCnt; c++) { + for (int i = 0; i < info->frame->nb_samples; i++) { + if (_info->fmt.bps == 8) { +- info->buffer[i*info->codec_context->channels+c] = ((int8_t *)info->frame->extended_data[c])[i]; ++ info->buffer[i*chCnt+c] = ((int8_t *)info->frame->extended_data[c])[i]; + out_size++; + } + else if (_info->fmt.bps == 16) { + int16_t outsample = ((int16_t *)info->frame->extended_data[c])[i]; +- ((int16_t*)info->buffer)[i*info->codec_context->channels+c] = outsample; ++ ((int16_t*)info->buffer)[i*chCnt+c] = outsample; + out_size += 2; + } + else if (_info->fmt.bps == 24) { +- memcpy (&info->buffer[(i*info->codec_context->channels+c)*3], &((int8_t*)info->frame->extended_data[c])[i*3], 3); ++ memcpy (&info->buffer[(i*chCnt+c)*3], &((int8_t*)info->frame->extended_data[c])[i*3], 3); + out_size += 3; + } + else if (_info->fmt.bps == 32) { + int32_t sample = ((int32_t *)info->frame->extended_data[c])[i]; +- ((int32_t*)info->buffer)[i*info->codec_context->channels+c] = sample; ++ ((int32_t*)info->buffer)[i*chCnt+c] = sample; + out_size += 4; + } + } +@@ -784,7 +811,11 @@ ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) { + trace ("ffmpeg: samplerate is %d\n", samplerate); + trace ("ffmpeg: duration is %f\n", duration); + ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0) ++ if (bps <= 0 || info.codec_context->ch_layout.nb_channels <= 0 || samplerate <= 0) { ++#else + if (bps <= 0 || info.codec_context->channels <= 0 || samplerate <= 0) { ++#endif + goto error; + } + +@@ -819,7 +850,11 @@ ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) { + deadbeef->pl_add_meta (it, ":FILE_SIZE", s); + snprintf (s, sizeof (s), "%d", bps); + deadbeef->pl_add_meta (it, ":BPS", s); ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0) ++ snprintf (s, sizeof (s), "%d", info.codec_context->ch_layout.nb_channels); ++#else + snprintf (s, sizeof (s), "%d", info.codec_context->channels); ++#endif + deadbeef->pl_add_meta (it, ":CHANNELS", s); + if (is_codec_dsd(info.codec_context->codec_id)) { + snprintf (s, sizeof (s), "%d", samplerate * 8); +@@ -904,7 +939,7 @@ ffmpeg_init_exts (void) { + n = add_new_exts (n, new_exts, ';'); + } + else { +- AVInputFormat *ifmt = NULL; ++ const AVInputFormat *ifmt = NULL; + /* + * It's quite complicated to enumerate all supported extensions in + * ffmpeg. If a decoder defines extensions in ffmpeg, the probing diff --git a/audio/guitarix/guitarix.SlackBuild b/audio/guitarix/guitarix.SlackBuild index f55fb754779..eadb51e8cdc 100644 --- a/audio/guitarix/guitarix.SlackBuild +++ b/audio/guitarix/guitarix.SlackBuild @@ -89,6 +89,8 @@ if [ "${LV2:-yes}" = "no" ]; then LV2OPT=--no-lv2 fi +for i in $CWD/patches/*; do patch -p2 < $i ; done + # grrr, -DNDEBUG doesn't get added to the flags automatically... LIBDIR="/usr/lib${LIBDIRSUFFIX}" ./waf configure \ diff --git a/audio/guitarix/patches/always_inline.patch b/audio/guitarix/patches/always_inline.patch new file mode 100644 index 00000000000..940649f11c9 --- /dev/null +++ b/audio/guitarix/patches/always_inline.patch @@ -0,0 +1,22 @@ +diff --git a/trunk/src/ladspa/ladspa_guitarix.cpp b/trunk/src/ladspa/ladspa_guitarix.cpp +index 1fccffb3..85c3a766 100644 +--- a/trunk/src/ladspa/ladspa_guitarix.cpp ++++ b/trunk/src/ladspa/ladspa_guitarix.cpp +@@ -16,8 +16,6 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#define always_inline inline __attribute__((always_inline)) +- + #include + #include + #include +@@ -34,6 +32,8 @@ + #include "gx_faust_plugins.h" + #include "../plugins/pluginlib.h" + ++#define always_inline inline __attribute__((always_inline)) ++ + #include "faust/gx_ampout_ladspa.cc" + #include "faust/gx_outputlevel_ladspa.cc" + diff --git a/audio/guitarix/patches/gcc-13.patch b/audio/guitarix/patches/gcc-13.patch new file mode 100644 index 00000000000..90681810b15 --- /dev/null +++ b/audio/guitarix/patches/gcc-13.patch @@ -0,0 +1,12 @@ +diff --git a/trunk/src/LV2/DSP/gx_common.h b/trunk/src/LV2/DSP/gx_common.h +index 71108442..ea230e34 100644 +--- a/trunk/src/LV2/DSP/gx_common.h ++++ b/trunk/src/LV2/DSP/gx_common.h +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + ///////////////////////// DENORMAL PROTECTION WITH SSE ///////////////// + diff --git a/audio/jack/jack.SlackBuild b/audio/jack/jack.SlackBuild index 30fde24f08c..dcacc0e765f 100644 --- a/audio/jack/jack.SlackBuild +++ b/audio/jack/jack.SlackBuild @@ -97,6 +97,8 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ +patch -p1 < $CWD/jack2_1.9.22_update_to_waf_2.0.26.patch + # Minor source of incompatibility between jack 1.x and 2.x: some jack # apps don't add -lpthread to their CFLAGS because they assume jack.pc # will already include it (it does, in 1.x). So make 2 act like 1: diff --git a/audio/jack/jack.info b/audio/jack/jack.info index 9567dbac3f2..8d5f329b993 100644 --- a/audio/jack/jack.info +++ b/audio/jack/jack.info @@ -2,9 +2,11 @@ PRGNAM="jack" VERSION="1.9.22" HOMEPAGE="http://jackaudio.org/" DOWNLOAD="https://github.com/jackaudio/jack2/archive/v1.9.22/jack2-1.9.22.tar.gz \ - https://github.com/jackaudio/jack-example-tools/archive/4/jack-example-tools-4.tar.gz" + https://github.com/jackaudio/jack-example-tools/archive/4/jack-example-tools-4.tar.gz \ + https://ponce.cc/slackware/sources/repo/jack2_1.9.22_update_to_waf_2.0.26.patch" MD5SUM="e57c8ad3de75f78b6eb7aacea4e25755 \ - 282f4c913489b32edc9926c8f84a73ae" + 282f4c913489b32edc9926c8f84a73ae \ + 7ba0b85ffedc67e8c850e463076bd28e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/audio/musepack-tools/musepack-tools.SlackBuild b/audio/musepack-tools/musepack-tools.SlackBuild index 06f77c23ee9..46c11ba3e8f 100644 --- a/audio/musepack-tools/musepack-tools.SlackBuild +++ b/audio/musepack-tools/musepack-tools.SlackBuild @@ -69,7 +69,7 @@ patch -p1 < $CWD/musepack-tools-465-fno-common.patch mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -Wno-error=incompatible-pointer-types" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DCMAKE_BUILD_TYPE=Release .. diff --git a/audio/musikcube/musikcube.SlackBuild b/audio/musikcube/musikcube.SlackBuild index 3862f8e7a79..bd52cbc4ea6 100644 --- a/audio/musikcube/musikcube.SlackBuild +++ b/audio/musikcube/musikcube.SlackBuild @@ -82,6 +82,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 {} + +sed -i "s|ncursesw/||" src/musikcube/cursespp/cursespp/curses_config.h + # Install .so files to /usr/lib$LIBDIRSUFFIX instead of /usr/share cp $CWD/fix-install-locations.patch . sed -i "s/lib\//lib$LIBDIRSUFFIX\//" fix-install-locations.patch diff --git a/audio/wireplumber/README b/audio/wireplumber/README deleted file mode 100644 index 15a585ead15..00000000000 --- a/audio/wireplumber/README +++ /dev/null @@ -1,25 +0,0 @@ -Wireplumber - Session / policy manager implementation for PipeWire - -WirePlumber is a modular session / policy manager for PipeWire and a -GObject-based high-level library that wraps PipeWire’s API, -providing convenience for writing the daemon’s modules as well as -external tools for managing PipeWire. - -The WirePlumber daemon implements the session & policy management -service. It follows a modular design, having plugins that implement -the actual management functionality. - -The WirePlumber Library provides API that allows you to extend the -WirePlumber daemon, to write management or status tools for PipeWire -(apps that don’t do actual media streaming) and to write custom -session managers for embedded devices. - - -Replacement of pipewire-media : -Based on what P. Volkerding did for pulseaudio/pipewire -There are 2 scripts to enable/disable wireplumber, in /usr/sbin : -- wireplumber-enable.sh -- wireplumber-disable.sh - -For the changes to take effect : -logout / login diff --git a/audio/wireplumber/doinst.sh b/audio/wireplumber/doinst.sh deleted file mode 100644 index 9018c147dbc..00000000000 --- a/audio/wireplumber/doinst.sh +++ /dev/null @@ -1,5 +0,0 @@ -# Toss redundant sample files: -for file in wireplumber.desktop ; do - cmp etc/xdg/autostart/${file} etc/xdg/autostart/${file}.sample 2> /dev/null && rm etc/xdg/autostart/${file}.sample -done - diff --git a/audio/wireplumber/slack-desc b/audio/wireplumber/slack-desc deleted file mode 100644 index 18f46d565b1..00000000000 --- a/audio/wireplumber/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------------------------------------------------------| -wireplumber: wireplumber (Session / policy manager implementation for PipeWire) -wireplumber: -wireplumber: WirePlumber is a modular session / policy manager for -wireplumber: PipeWire and a GObject-based high-level library -wireplumber: that wraps PipeWire's API, providing convenience for writini -wireplumber: the daemon's modules as well as external tools for managing PipeWire. -wireplumber: It follows a modular design, having plugins that implement the actual -wireplumber: management functionality. -wireplumber: -wireplumber: https://gitlab.com/pipewire/wireplumber -wireplumber: diff --git a/audio/wireplumber/wireplumber-disable.sh b/audio/wireplumber/wireplumber-disable.sh deleted file mode 100644 index 9a7c8d14f0e..00000000000 --- a/audio/wireplumber/wireplumber-disable.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -# Copyright 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA -# 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. - -# This script will attempt to disable pipewire as the default audio server, -# changing it back to pulseaudio. - -# Remove or rename the XDG autostart files: -for file in /etc/xdg/autostart/wireplumber.desktop ; do - if [ -r ${file}.sample ]; then - rm -f $file - elif [ -r $file ]; then - mv ${file} ${file}.sample - fi -done - -# Condition: check if pipewire is enabled -if [ -f /etc/xdg/autostart/pipewire.desktop ] ; then - # Enable pipewire-media-session.desktop: - if grep -q "^Hidden=true$" /etc/xdg/autostart/pipewire-media-session.desktop ; then - grep -v "^Hidden=true$" /etc/xdg/autostart/pipewire-media-session.desktop > /etc/xdg/autostart/pipewire-media-session.desktop.new - mv /etc/xdg/autostart/pipewire-media-session.desktop.new /etc/xdg/autostart/pipewire-media-session.desktop - fi - - echo "Pipewire Media Session enabled as media session server." - if ps ax | grep -q wireplumber ; then - echo - echo "You may need to stop running daemon/wireplumber processes." - echo "The clean way is to run these commands as the user that owns the processes:" - echo "/usr/bin/daemon --pidfiles=~/.run --name=wireplumber --stop" - echo - echo "The quick and dirty way if nothing else on the machine is using the daemon" - echo "utility is to issue this command:" - echo "killall daemon" - fi -fi - diff --git a/audio/wireplumber/wireplumber-enable.sh b/audio/wireplumber/wireplumber-enable.sh deleted file mode 100644 index 1aac9d4ae1d..00000000000 --- a/audio/wireplumber/wireplumber-enable.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -# Copyright 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA -# 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. - -# This script will attempt to enable wireplumber as the default media session server. - -# Condition: check if pipewire is enabled -if [ -f /etc/xdg/autostart/pipewire.desktop ] ; then - - # Rename the XDG autostart files: - for file in /etc/xdg/autostart/wireplumber.desktop.sample ; do - if [ -r $file ]; then - mv $file /etc/xdg/autostart/$(basename $file .sample) - fi - done - - # Disable pipewire-media-session.desktop: - if ! grep -q "^Hidden=true$" /etc/xdg/autostart/pipewire-media-session.desktop ; then - echo "Hidden=true" >> /etc/xdg/autostart/pipewire-media-session.desktop - fi - echo "Wireplumber enabled as system media session server." -else - echo "Pipewire is disabled" - echo "you must enable pipewire first : /usr/sbin/pipewire-enable.sh" -fi diff --git a/audio/wireplumber/wireplumber.SlackBuild b/audio/wireplumber/wireplumber.SlackBuild deleted file mode 100644 index fc92c597cda..00000000000 --- a/audio/wireplumber/wireplumber.SlackBuild +++ /dev/null @@ -1,147 +0,0 @@ -#!/bin/bash - -# Copyright 2022, marav, Paris, FR -# 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. - -# 20241018 bkw: Modified by SlackBuilds.org, BUILD=3: build with lua 5.4. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=wireplumber -VERSION=${VERSION:-0.4.7} -BUILD=${BUILD:-3} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z || exit 1 -cd $PRGNAM-$VERSION || exit 1 -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 {} \+ - -# Set options to build with or without documentation / introspection -# These options are disabled by default -WITHDOC=${WITHDOC:-no} -WITHINTROSPEC=${WITHINTROSPEC:-no} - -if [ $WITHDOC == "no" ]; then - DOC_OPTION="-Ddoc=disabled" - else - DOC_OPTION="-Ddoc=auto" -fi - -if [ $WITHINTROSPEC == "no" ]; then - INTROSPEC_OPTION="-Dintrospection=disabled" - else - INTROSPEC_OPTION="-Dintrospection=auto" -fi - -# Configure, build, and install: -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" -mkdir meson-build -cd meson-build -meson setup \ - --prefix=/usr \ - --libdir=lib${LIBDIRSUFFIX} \ - --libexecdir=/usr/libexec \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --includedir=/usr/include \ - --datadir=/usr/share \ - --mandir=/usr/man \ - -Dsystem-lua=true \ - -Dsystemd=disabled \ - -Dsystemd-user-service=false \ - $DOC_OPTION \ - $INTROSPEC_OPTION \ - .. - "${NINJA:=ninja}" - DESTDIR=$PKG $NINJA install -cd .. - -# Add sample configuation files: -mkdir -p $PKG/etc/xdg/autostart -cp -a $CWD/wireplumber.desktop.sample $PKG/etc/xdg/autostart -chown root:root $PKG/etc/xdg/autostart/* -chmod 644 $PKG/etc/xdg/autostart/* - -mkdir -p $PKG/usr/sbin -cp -a $CWD/wireplumber-disable.sh $PKG/usr/sbin -cp -a $CWD/wireplumber-enable.sh $PKG/usr/sbin -chown root:root $PKG/usr/sbin/wireplumber-disable.sh $PKG/usr/sbin/wireplumber-enable.sh -chmod 755 $PKG/usr/sbin/wireplumber-disable.sh $PKG/usr/sbin/wireplumber-enable.sh - -# Strip binaries: -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - LICENSE NEWS.rst README.rst \ - $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 -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE - diff --git a/audio/wireplumber/wireplumber.desktop.sample b/audio/wireplumber/wireplumber.desktop.sample deleted file mode 100644 index d3ebdea2d3a..00000000000 --- a/audio/wireplumber/wireplumber.desktop.sample +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Wireplumber -Comment=Start the Wireplumber -Exec=/usr/bin/daemon -frB --pidfiles=~/.run --name=wireplumber /usr/bin/wireplumber -Terminal=false -Type=Application -X-GNOME-Autostart-Phase=Initialization -X-KDE-autostart-after=pipewire -X-KDE-autostart-phase=1 diff --git a/audio/wireplumber/wireplumber.info b/audio/wireplumber/wireplumber.info deleted file mode 100644 index 158b48bbed0..00000000000 --- a/audio/wireplumber/wireplumber.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="wireplumber" -VERSION="0.4.7" -HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" -DOWNLOAD="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.7/wireplumber-0.4.7.tar.gz" -MD5SUM="9e63d8944f91b6a4646a736b1f1db251" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="lua" -MAINTAINER="marav" -EMAIL="marav8@free.fr" diff --git a/audio/xmms2/ffmpeg-7.patch b/audio/xmms2/ffmpeg-7.patch new file mode 100644 index 00000000000..08d441b148a --- /dev/null +++ b/audio/xmms2/ffmpeg-7.patch @@ -0,0 +1,40 @@ +diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c +index f9558461..1f0d9b76 100644 +--- a/src/plugins/avcodec/avcodec.c ++++ b/src/plugins/avcodec/avcodec.c +@@ -222,7 +222,7 @@ xmms_avcodec_init (xmms_xform_t *xform) + + data->codecctx = avcodec_alloc_context3 (codec); + data->codecctx->sample_rate = data->samplerate; +- data->codecctx->channels = data->channels; ++ data->codecctx->ch_layout.nb_channels = data->channels; + data->codecctx->bit_rate = data->bitrate; + data->codecctx->bits_per_coded_sample = data->samplebits; + data->codecctx->block_align = data->block_align; +@@ -250,7 +250,7 @@ xmms_avcodec_init (xmms_xform_t *xform) + } + + data->samplerate = data->codecctx->sample_rate; +- data->channels = data->codecctx->channels; ++ data->channels = data->codecctx->ch_layout.nb_channels; + data->sampleformat = xmms_avcodec_translate_sample_format (data->codecctx->sample_fmt); + if (data->sampleformat == XMMS_SAMPLE_FORMAT_UNKNOWN) { + avcodec_close (data->codecctx); +@@ -270,7 +270,7 @@ xmms_avcodec_init (xmms_xform_t *xform) + + XMMS_DBG ("Decoder %s at rate %d with %d channels of format %s initialized", + codec->name, data->codecctx->sample_rate, +- data->codecctx->channels, ++ data->codecctx->ch_layout.nb_channels, + av_get_sample_fmt_name (data->codecctx->sample_fmt)); + + return TRUE; +@@ -504,7 +504,7 @@ xmms_avcodec_internal_append (xmms_avcodec_data_t *data) + { + enum AVSampleFormat fmt = (enum AVSampleFormat) data->read_out_frame->format; + int samples = data->read_out_frame->nb_samples; +- int channels = data->codecctx->channels; ++ int channels = data->codecctx->ch_layout.nb_channels; + int bps = av_get_bytes_per_sample (fmt); + + if (av_sample_fmt_is_planar (fmt)) { diff --git a/audio/xmms2/xmms2.SlackBuild b/audio/xmms2/xmms2.SlackBuild index 42916441e24..70627063808 100644 --- a/audio/xmms2/xmms2.SlackBuild +++ b/audio/xmms2/xmms2.SlackBuild @@ -61,6 +61,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/ffmpeg-7.patch + export CCFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" diff --git a/business/ledger/boost-185.patch b/business/ledger/boost-185.patch new file mode 100644 index 00000000000..f0c1f6a8c21 --- /dev/null +++ b/business/ledger/boost-185.patch @@ -0,0 +1,22 @@ +From 1da89f6ffb44a44257b9774c4ceb71e7b495d677 Mon Sep 17 00:00:00 2001 +From: Michael Cho +Date: Thu, 25 Apr 2024 11:29:49 -0400 +Subject: [PATCH] Fix build with Boost 1.85.0 + +Signed-off-by: Michael Cho +--- + src/system.hh.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/system.hh.in b/src/system.hh.in +index 05f28fc24..070f1cd4a 100644 +--- a/src/system.hh.in ++++ b/src/system.hh.in +@@ -140,7 +140,6 @@ + #include + #include + +-#include + #include + #include + #include diff --git a/business/ledger/ledger.SlackBuild b/business/ledger/ledger.SlackBuild index 9e4abd59bfa..91c849db50d 100644 --- a/business/ledger/ledger.SlackBuild +++ b/business/ledger/ledger.SlackBuild @@ -52,6 +52,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ patch -p1 < $CWD/boost-176.patch +patch -p1 < $CWD/boost-185.patch # 20220301 bkw: do not look for utfcpp's headers in /usr/include, use # only the bundled copy (otherwise the build breaks if utfcpp is installed). diff --git a/desktop/glabels/glabels.SlackBuild b/desktop/glabels/glabels.SlackBuild index 7ecdaa4e6ba..86805e3feff 100644 --- a/desktop/glabels/glabels.SlackBuild +++ b/desktop/glabels/glabels.SlackBuild @@ -81,7 +81,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 {} \; -CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition" \ +CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition -Wno-incompatible-pointer-types" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/desktop/lxappearance-obconf/lxappearance-obconf.SlackBuild b/desktop/lxappearance-obconf/lxappearance-obconf.SlackBuild index 26a3121ca13..abf6ead9e63 100644 --- a/desktop/lxappearance-obconf/lxappearance-obconf.SlackBuild +++ b/desktop/lxappearance-obconf/lxappearance-obconf.SlackBuild @@ -28,8 +28,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lxappearance-obconf -VERSION=${VERSION:-0.2.3} -BUILD=${BUILD:-4} +VERSION=${VERSION:-20231122_f663dca} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -83,8 +83,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 {} \; -if [ "$GTK3" = "--enable-gtk3" ]; then sed -i /frame1/,+19d src/obconf.glade ; fi - sh autogen.sh || true CFLAGS="$SLKCFLAGS" \ diff --git a/desktop/lxappearance-obconf/lxappearance-obconf.info b/desktop/lxappearance-obconf/lxappearance-obconf.info index 637f4999f82..cf056cca0d6 100644 --- a/desktop/lxappearance-obconf/lxappearance-obconf.info +++ b/desktop/lxappearance-obconf/lxappearance-obconf.info @@ -1,8 +1,8 @@ PRGNAM="lxappearance-obconf" -VERSION="0.2.3" +VERSION="20231122_f663dca" HOMEPAGE="https://lxde.org/" -DOWNLOAD="http://downloads.sf.net/lxde/lxappearance-obconf-0.2.3.tar.xz" -MD5SUM="ae0076d489aa786f5d573f7ff592a4ab" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/lxappearance-obconf-20231122_f663dca.tar.xz" +MD5SUM="68ffd90cffb6acb1ce701fa9090987d3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lxappearance openbox" diff --git a/desktop/lxpanel/lxpanel.SlackBuild b/desktop/lxpanel/lxpanel.SlackBuild index 2e16ffb8336..7ef88cb5efc 100644 --- a/desktop/lxpanel/lxpanel.SlackBuild +++ b/desktop/lxpanel/lxpanel.SlackBuild @@ -87,14 +87,14 @@ for i in $CWD/patches/* ; do patch -p1 < $i ; done ./autogen.sh || true -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --localstatedir=/var \ --sysconfdir=/etc \ - --enable-man \ + --enable-debug=no \ --mandir=/usr/man \ --program-prefix= \ --program-suffix= \ diff --git a/desktop/murrine/gtk-murrine-engine-c99.patch b/desktop/murrine/gtk-murrine-engine-c99.patch new file mode 100644 index 00000000000..b4d16109496 --- /dev/null +++ b/desktop/murrine/gtk-murrine-engine-c99.patch @@ -0,0 +1,634 @@ + + + + + + Tree - rpms/gtk-murrine-engine - src.fedoraproject.org + + + + + + + + + + + + + + + + + + +
+ + +
+
+
+
+
+
+

+

+
+
+

+rpms / gtk-murrine-engine +

+
+
+
+
+
+
+ + + Clone + +
+
+
+
Source Code
+ +
+
+
GIT
+ +
+
+
+
+
+ +
+
+
+
+ + +
+
+ +
+
+
+
+
+
+
+

+ Files +

+
+ +
+
+ +
+
+
+
+
+
    +
  1. + + +   e3f6ab3d10f3124353ace08471dd42b87af76399 + +
    2. +
  2. + +   gtk-murrine-engine-c99.patch +
    3. +
+
+ +
+
+
+ + +
+ + Blob + + Blame + + History + + Raw +
+ + 
Add a few missing function prototypes, to avoid future build failures once
+compilers start to reject implicit function declarations by default.
+
+diff -ur murrine-0.98.2.orig/src/murrine_rc_style.h murrine-0.98.2/src/murrine_rc_style.h
+--- murrine-0.98.2.orig/src/murrine_rc_style.h	2012-01-17 18:46:01.000000000 +0100
++++ murrine-0.98.2/src/murrine_rc_style.h	2022-12-14 21:33:03.242067429 +0100
+@@ -154,5 +154,6 @@
+ };
+ 
+ GType murrine_rc_style_get_type	(void);
++void murrine_rc_style_register_types (GTypeModule *module);
+ 
+ #endif /* MURRINE_RC_STYLE_H */
+diff -ur murrine-0.98.2.orig/src/murrine_style.h murrine-0.98.2/src/murrine_style.h
+--- murrine-0.98.2.orig/src/murrine_style.h	2012-01-17 18:46:01.000000000 +0100
++++ murrine-0.98.2/src/murrine_style.h	2022-12-14 21:33:41.604671684 +0100
+@@ -102,5 +102,6 @@
+ };
+ 
+ GType murrine_style_get_type (void);
++void murrine_style_register_types (GTypeModule *module);
+ 
+ #endif /* MURRINE_STYLE_H */
+diff -ur murrine-0.98.2.orig/src/support.h murrine-0.98.2/src/support.h
+--- murrine-0.98.2.orig/src/support.h	2012-01-17 18:46:01.000000000 +0100
++++ murrine-0.98.2/src/support.h	2022-12-14 21:27:27.288533100 +0100
+@@ -118,6 +118,10 @@
+ 
+ #define MRN_WIDGET_HAS_DEFAULT(object) ((object) && MRN_IS_WIDGET(object) && GTK_WIDGET_HAS_DEFAULT(object))
+ 
++gboolean murrine_object_is_a (const GObject * object, const gchar * type_name);
++gboolean murrine_widget_is_ltr (GtkWidget *widget);
++
++
+ G_GNUC_INTERNAL GtkTextDirection murrine_get_direction (GtkWidget *widget);
+ G_GNUC_INTERNAL GtkWidget *murrine_special_get_ancestor (GtkWidget *widget, GType widget_type);
+ G_GNUC_INTERNAL GdkColor* murrine_get_parent_bgcolor (GtkWidget *widget);
+
+
+
+ +
+
+
+
+ +
+
+
+
+
Powered by Pagure 5.13.3
+ +
+
+
© Red Hat, Inc. and others.
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/desktop/murrine/murrine.SlackBuild b/desktop/murrine/murrine.SlackBuild index 5c701a4983a..56754d09987 100644 --- a/desktop/murrine/murrine.SlackBuild +++ b/desktop/murrine/murrine.SlackBuild @@ -80,6 +80,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/gtk-murrine-engine-c99.patch # Fix build with slibtool # https://bazaar.launchpad.net/~murrine-daily/murrine/trunk/revision/380/Makefile.am patch -p0 < $CWD/380_379.diff diff --git a/desktop/obconf/obconf-c99.patch b/desktop/obconf/obconf-c99.patch new file mode 100644 index 00000000000..8848f8bce15 --- /dev/null +++ b/desktop/obconf/obconf-c99.patch @@ -0,0 +1,47 @@ +Avoid implicit function declarations + +For compatibility with future compilers which do not support them +by default. + +Include for toupper, "moveresize.h" for +moveresize_setup_tab, and add a desktops_setup_tab prototype to +"desktops.h" because it is called from main.c. + +Submitted upstream: + +diff --git a/src/appearance.c b/src/appearance.c +index 4fb3f0c12ad9b143..da39273a16a3aea7 100644 +--- a/src/appearance.c ++++ b/src/appearance.c +@@ -21,6 +21,8 @@ + #include "tree.h" + #include "preview_update.h" + ++#include ++ + static gboolean mapping = FALSE; + + static RrFont *read_font(GtkFontButton *w, const gchar *place, gboolean def); +diff --git a/src/desktops.h b/src/desktops.h +index 1ba3e366d41f5c3d..5f7e32321dbfa3c4 100644 +--- a/src/desktops.h ++++ b/src/desktops.h +@@ -24,5 +24,6 @@ + + void desktops_setup_num(GtkWidget *w); + void desktops_setup_names(GtkWidget *w); ++void desktops_setup_tab(void); + + #endif +diff --git a/src/main.c b/src/main.c +index d7e34469ecc72914..017603537c1f8de1 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -28,6 +28,7 @@ + #include "dock.h" + #include "preview_update.h" + #include "gettext.h" ++#include "moveresize.h" + + #include + #define SN_API_NOT_YET_FROZEN diff --git a/desktop/obconf/obconf.SlackBuild b/desktop/obconf/obconf.SlackBuild index 3ad3b1976c7..d5769b1c2bb 100644 --- a/desktop/obconf/obconf.SlackBuild +++ b/desktop/obconf/obconf.SlackBuild @@ -81,6 +81,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/obconf-c99.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/openbox/openbox.SlackBuild b/desktop/openbox/openbox.SlackBuild index 36d3f279e61..80501d9f46b 100644 --- a/desktop/openbox/openbox.SlackBuild +++ b/desktop/openbox/openbox.SlackBuild @@ -102,6 +102,8 @@ find -L . \ # Convert openbox-xdg-autostart from python2 to python3 patch -p1 < $CWD/py2-to-py3.patch +for i in $CWD/patches/* ; do patch -p1 < $i ; done + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/openbox/patches/917204_undecorated_maximized_no_border.patch b/desktop/openbox/patches/917204_undecorated_maximized_no_border.patch new file mode 100644 index 00000000000..915cc1ea9af --- /dev/null +++ b/desktop/openbox/patches/917204_undecorated_maximized_no_border.patch @@ -0,0 +1,22 @@ +Description: Removed top border on undecorated maximized windows +Author: Valentin Blot +Origin: other +Bug-Debian: https://bugs.debian.org/917204 +Forwarded: no +Last-Update: 2018-12-23 + +--- a/openbox/frame.c ++++ b/openbox/frame.c +@@ -585,12 +585,6 @@ void frame_adjust_area(ObFrame *self, gb + + if (self->decorations & OB_FRAME_DECOR_TITLEBAR) + self->size.top += ob_rr_theme->title_height + self->bwidth; +- else if (self->max_horz && self->max_vert) { +- /* A maximized and undecorated window needs a border on the +- top of the window to let the user still undecorate/unmaximize the +- window via the client menu. */ +- self->size.top += self->bwidth; +- } + + if (self->decorations & OB_FRAME_DECOR_HANDLE && + ob_rr_theme->handle_height > 0) diff --git a/desktop/openbox/patches/9ed6fdd71890c5cc43747f105382d5677e5d37e7.patch b/desktop/openbox/patches/9ed6fdd71890c5cc43747f105382d5677e5d37e7.patch new file mode 100644 index 00000000000..ef68d31213c --- /dev/null +++ b/desktop/openbox/patches/9ed6fdd71890c5cc43747f105382d5677e5d37e7.patch @@ -0,0 +1,50 @@ +From 9ed6fdd71890c5cc43747f105382d5677e5d37e7 Mon Sep 17 00:00:00 2001 +From: pldubouilh +Date: Fri, 17 Mar 2023 18:23:47 +0100 +Subject: [PATCH] Fix list traversal issue in client_calc_layer + +The calls to client_calc_layer_internal can modify stacking_list, which +can cause us to follow dangling ->next pointers (either by the pointer +itself already being freed, or it pointing to a freed area). Avoid this +by copying the list first, the goal is to visit every client in the list +once so this should be fine. +--- + openbox/client.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/openbox/client.c b/openbox/client.c +index 7168b2407..b8264587c 100644 +--- a/openbox/client.c ++++ b/openbox/client.c +@@ -2742,9 +2742,12 @@ static void client_calc_layer_internal(ObClient *self) + void client_calc_layer(ObClient *self) + { + GList *it; ++ /* the client_calc_layer_internal calls below modify stacking_list, ++ so we have to make a copy to iterate over */ ++ GList *list = g_list_copy(stacking_list); + + /* skip over stuff above fullscreen layer */ +- for (it = stacking_list; it; it = g_list_next(it)) ++ for (it = list; it; it = g_list_next(it)) + if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; + + /* find the windows in the fullscreen layer, and mark them not-visited */ +@@ -2757,7 +2760,7 @@ void client_calc_layer(ObClient *self) + client_calc_layer_internal(self); + + /* skip over stuff above fullscreen layer */ +- for (it = stacking_list; it; it = g_list_next(it)) ++ for (it = list; it; it = g_list_next(it)) + if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; + + /* now recalc any windows in the fullscreen layer which have not +@@ -2768,6 +2771,8 @@ void client_calc_layer(ObClient *self) + !WINDOW_AS_CLIENT(it->data)->visited) + client_calc_layer_internal(it->data); + } ++ ++ g_list_free(it); + } + + gboolean client_should_show(ObClient *self) diff --git a/desktop/openbox/patches/debian-887908.patch b/desktop/openbox/patches/debian-887908.patch new file mode 100644 index 00000000000..2c8794ed7f8 --- /dev/null +++ b/desktop/openbox/patches/debian-887908.patch @@ -0,0 +1,31 @@ +Description: Fix toggled hover and pressed images masks not loaded +Author: "E. Serradilla" +Debian-Bugs: https://bugs.debian.org/887908 + +--- a/obrender/theme.c ++++ b/obrender/theme.c +@@ -1494,8 +1494,10 @@ static void read_button_styles(XrmDataba + READ_BUTTON_MASK_COPY(disabled, btn->unpressed_mask); + READ_BUTTON_MASK_COPY(hover, btn->unpressed_mask); + if (toggled_mask) { +- READ_BUTTON_MASK_COPY(pressed_toggled, btn->unpressed_toggled_mask); +- READ_BUTTON_MASK_COPY(hover_toggled, btn->unpressed_toggled_mask); ++ g_snprintf(name, 128, "%s_toggled_pressed.xbm", btnname); ++ READ_MASK_COPY(name, btn->pressed_toggled_mask, btn->unpressed_toggled_mask); ++ g_snprintf(name, 128, "%s_toggled_hover.xbm", btnname); ++ READ_MASK_COPY(name, btn->hover_toggled_mask, btn->unpressed_toggled_mask); + } + + #define READ_BUTTON_APPEARANCE(typedots, type, fallback) \ +@@ -1532,8 +1534,8 @@ static void read_button_styles(XrmDataba + READ_BUTTON_APPEARANCE("disabled", disabled, 0); + READ_BUTTON_APPEARANCE("hover", hover, 0); + if (toggled_mask) { +- READ_BUTTON_APPEARANCE("unpressed.toggled", unpressed_toggled, 1); +- READ_BUTTON_APPEARANCE("pressed.toggled", pressed_toggled, 0); +- READ_BUTTON_APPEARANCE("hover.toggled", hover_toggled, 0); ++ READ_BUTTON_APPEARANCE("toggled.unpressed", unpressed_toggled, 1); ++ READ_BUTTON_APPEARANCE("toggled.pressed", pressed_toggled, 0); ++ READ_BUTTON_APPEARANCE("toggled.hover", hover_toggled, 0); + } + } diff --git a/desktop/wmMoonClock/wmMoonClock.SlackBuild b/desktop/wmMoonClock/wmMoonClock.SlackBuild index ad279b4d47f..36a1b24ca43 100644 --- a/desktop/wmMoonClock/wmMoonClock.SlackBuild +++ b/desktop/wmMoonClock/wmMoonClock.SlackBuild @@ -66,7 +66,7 @@ find -L . \ cd Src mkdir -p $PKG/usr/{bin,man/man1} make \ - CFLAGS="$SLKCFLAGS -fcommon" \ + CFLAGS="$SLKCFLAGS -fcommon -fpermissive" \ INCDIR="-I/usr/include/X11" \ LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" make install DESTDIR=$PKG/usr diff --git a/desktop/wmSun/wmSun.SlackBuild b/desktop/wmSun/wmSun.SlackBuild index 810df479059..a0294ded55f 100644 --- a/desktop/wmSun/wmSun.SlackBuild +++ b/desktop/wmSun/wmSun.SlackBuild @@ -65,7 +65,7 @@ find -L . \ cd wmSun mkdir -p $PKG/usr/{bin,man/man1} make \ - COPTS="$SLKCFLAGS -fcommon" \ + COPTS="$SLKCFLAGS -fcommon -fpermissive" \ INCDIR="-I/usr/include/X11" \ LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" make install DESTDIR=$PKG/usr diff --git a/desktop/wmSunMoon/wmSunMoon.SlackBuild b/desktop/wmSunMoon/wmSunMoon.SlackBuild index 4ec61ff6b1c..1359d21379c 100644 --- a/desktop/wmSunMoon/wmSunMoon.SlackBuild +++ b/desktop/wmSunMoon/wmSunMoon.SlackBuild @@ -65,7 +65,7 @@ find -L . \ cd wmSunMoon mkdir -p $PKG/usr/{bin,man/man1,,man/man7,doc/$PRGNAM-$VERSION} make \ - COPTS="$SLKCFLAGS -fcommon" \ + COPTS="$SLKCFLAGS -fcommon -fpermissive" \ INCDIR="-I/usr/include/X11" \ LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" cp -a wmSunMoon $PKG/usr/bin diff --git a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild index f075e528681..b2484290c4c 100644 --- a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild +++ b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xfce4-cpugraph-plugin -VERSION=${VERSION:-1.2.6} +VERSION=${VERSION:-1.2.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info index e12ac4a63bf..a0837ac60cd 100644 --- a/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info +++ b/desktop/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-cpugraph-plugin" -VERSION="1.2.6" +VERSION="1.2.7" HOMEPAGE="https://goodies.xfce.org/" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.2/xfce4-cpugraph-plugin-1.2.6.tar.bz2" -MD5SUM="5598a55557cd03583b1867432dc51039" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.2/xfce4-cpugraph-plugin-1.2.7.tar.bz2" +MD5SUM="0480611899650e2d4304d13e0e0dda77" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild index 9486471dbb5..260088327d8 100644 --- a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild +++ b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xfce4-sensors-plugin -VERSION=${VERSION:-1.4.3} +VERSION=${VERSION:-1.4.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info index 67196fa56a3..d3d9fb0eb8f 100644 --- a/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info +++ b/desktop/xfce4-sensors-plugin/xfce4-sensors-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-sensors-plugin" -VERSION="1.4.3" +VERSION="1.4.4" HOMEPAGE="https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin/start" -DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.4/xfce4-sensors-plugin-1.4.3.tar.bz2" -MD5SUM="e55dfea49b0c5e9edf068db3b8398240" +DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.4/xfce4-sensors-plugin-1.4.4.tar.bz2" +MD5SUM="0684f0f86e2edfb306086445478f7bbd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.SlackBuild b/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.SlackBuild index 053a4b0cde5..5edc9c0e823 100644 --- a/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.SlackBuild +++ b/desktop/xfce4-volumed-pulse/xfce4-volumed-pulse.SlackBuild @@ -83,6 +83,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 {} \; +sed -i -e "s|XDT_CHECK_PACKAGE(\[GLIB\], \[glib-2.0\], \[2.16\])|XDT_CHECK_PACKAGE(\[GLIB\], \[glib-2.0\], \[2.26\])|" configure.ac.in + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/zenity/README b/desktop/zenity/README index 125286c90e5..79ad8648343 100644 --- a/desktop/zenity/README +++ b/desktop/zenity/README @@ -4,7 +4,8 @@ similar to the classic `dialog` program, but with a GUI interface. OPTIONAL DEPENDENCIES: -* webkit2gtk-4.1 +* webkit2gtk-6.0 (ie, webkitgtk for gtk4; NOT yet part of sbo-ponce as + of 2024-07-28) To enable: pass `WEBKITGTK=true` as an option to the slackbuild. If this is not specified, it will default to `false`. diff --git a/desktop/zenity/zenity.SlackBuild b/desktop/zenity/zenity.SlackBuild index f0efbc5a67f..2a84a3636d7 100644 --- a/desktop/zenity/zenity.SlackBuild +++ b/desktop/zenity/zenity.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=zenity -VERSION=${VERSION:-3.44.5} +VERSION=${VERSION:-4.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,27 +79,24 @@ 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 {} \; -# nb: libnotify is enabled by default as it is included in slackware. -# webkitgtk is an optional dependency (NOT included in slackware) which may be -# enabled upon request. +# webkitgtk is an optional dependency (NOT included in slackware or even +# sbo-ponce as yet; see README) which may be enabled upon request. mkdir build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson .. \ - --buildtype=release \ - --infodir=/usr/info \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --mandir=/usr/man \ - --prefix=/usr \ - --sysconfdir=/etc \ - -Dlibnotify=true \ - -Dwebkitgtk=${WEBKITGTK:-false} - ninja - DESTDIR=$PKG ninja install -cd .. +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +meson setup \ + --buildtype=release \ + --infodir=/usr/info \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ + --mandir=/usr/man \ + --prefix=/usr \ + --sysconfdir=/etc \ + -Dwebkitgtk=${WEBKITGTK:-false} \ + build/ +ninja -v -C build/ +DESTDIR=$PKG ninja -v -C build/ install 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 diff --git a/desktop/zenity/zenity.info b/desktop/zenity/zenity.info index c32ae1081eb..5cd4c8868ea 100644 --- a/desktop/zenity/zenity.info +++ b/desktop/zenity/zenity.info @@ -1,10 +1,10 @@ PRGNAM="zenity" -VERSION="3.44.5" +VERSION="4.0.2" HOMEPAGE="https://gitlab.gnome.org/GNOME/zenity" -DOWNLOAD="https://download.gnome.org/sources/zenity/3.44/zenity-3.44.5.tar.xz" -MD5SUM="69f4a4fdce7217231207019a6e27636b" +DOWNLOAD="https://download.gnome.org/sources/zenity/4.0/zenity-4.0.2.tar.xz" +MD5SUM="08ba19bb3fe5c180402690d5c40c6cc3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="libadwaita" MAINTAINER="Logan Rathbone" EMAIL="poprocks@gmail.com" diff --git a/development/Sphinx/README b/development/Sphinx/README deleted file mode 100644 index e3f923a7f79..00000000000 --- a/development/Sphinx/README +++ /dev/null @@ -1,5 +0,0 @@ -Sphinx is a tool that translates a set of reStructuredText -source files into various output formats, including HTML, ePub, -LaTeX and plain text. Sphinx was originally created for the Python -documentation, but it has excellent facilities for the documentation -of software projects in a range of languages. diff --git a/development/Sphinx/Sphinx.SlackBuild b/development/Sphinx/Sphinx.SlackBuild deleted file mode 100644 index 330564c2745..00000000000 --- a/development/Sphinx/Sphinx.SlackBuild +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/bash - -# Slackware build script for Sphinx - -# Copyright 2023-2024 fourtysixandtwo -# Copyright 2013 Mikko Värri, Finland -# Copyright 2017-2021 Benjamin Trigona-Harany -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=Sphinx -SRCNAM=Sphinx -VERSION=${VERSION:-5.3.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$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 {} \+ - -# lower Pygments required version -sed -i '/Pygments>=/ s/2.12/2.10.0/' pyproject.toml - -python3 -m build --no-isolation -python3 -m installer -d "$PKG" dist/*.whl - -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 -cp -a \ - AUTHORS CHANGES EXAMPLES LICENSE README.rst \ - $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 diff --git a/development/Sphinx/Sphinx.info b/development/Sphinx/Sphinx.info deleted file mode 100644 index 9d05ca57e96..00000000000 --- a/development/Sphinx/Sphinx.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="Sphinx" -VERSION="5.3.0" -HOMEPAGE="http://www.sphinx-doc.org" -DOWNLOAD="https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-5.3.0.tar.gz" -MD5SUM="b752f7b0177865a36cbcdcef4ac80cd4" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="alabaster imagesize python3-babel snowballstemmer sphinxcontrib-applehelp sphinxcontrib-devhelp sphinxcontrib-htmlhelp sphinxcontrib-jsmath sphinxcontrib-qthelp sphinxcontrib-serializinghtml python-importlib_metadata" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/development/Sphinx/slack-desc b/development/Sphinx/slack-desc deleted file mode 100644 index 403648f0ae1..00000000000 --- a/development/Sphinx/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------------------------------------------------------| -Sphinx: Sphinx (Documentation generator) -Sphinx: -Sphinx: Sphinx is a tool that translates a set of reStructuredText source -Sphinx: files into various output formats, including HTML, ePub, LaTeX and -Sphinx: plain text. Sphinx was originally created for the Python -Sphinx: documentation, but it has excellent facilities for the documentation -Sphinx: of software projects in a range of languages. -Sphinx: -Sphinx: -Sphinx: -Sphinx: diff --git a/development/abseil-cpp/README b/development/abseil-cpp/README deleted file mode 100644 index b1b90760e14..00000000000 --- a/development/abseil-cpp/README +++ /dev/null @@ -1,2 +0,0 @@ -Abseil is an open-source collection of C++ code designed to augment the -C++ standard library. diff --git a/development/abseil-cpp/abseil-cpp.SlackBuild b/development/abseil-cpp/abseil-cpp.SlackBuild deleted file mode 100644 index 9acf083dbab..00000000000 --- a/development/abseil-cpp/abseil-cpp.SlackBuild +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/bash - -# Slackware build script for abseil-cpp - -# Copyright 2024 Isaac Yu -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=abseil-cpp -VERSION=${VERSION:-20240722.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -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 build -cd build - cmake \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -DNDEBUG" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_CXX_STANDARD=17 \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS CONTRIBUTING.md FAQ.md LICENSE README.md UPGRADES.md $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 diff --git a/development/abseil-cpp/abseil-cpp.info b/development/abseil-cpp/abseil-cpp.info deleted file mode 100644 index 1414611ba32..00000000000 --- a/development/abseil-cpp/abseil-cpp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="abseil-cpp" -VERSION="20240722.0" -HOMEPAGE="https://abseil.io" -DOWNLOAD="https://github.com/abseil/abseil-cpp/archive/20240722.0/abseil-cpp-20240722.0.tar.gz" -MD5SUM="740fb8f35ebdf82740c294bde408b9c0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Isaac Yu" -EMAIL="isaacyu@protonmail.com" diff --git a/development/abseil-cpp/slack-desc b/development/abseil-cpp/slack-desc deleted file mode 100644 index cd4106eb186..00000000000 --- a/development/abseil-cpp/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------------------------------------------------------| -abseil-cpp: abseil-cpp (Abseil C++ Common Libraries) -abseil-cpp: -abseil-cpp: Abseil is an open-source collection of C++ code designed to augment -abseil-cpp: the C++ standard library. -abseil-cpp: -abseil-cpp: -abseil-cpp: -abseil-cpp: -abseil-cpp: -abseil-cpp: -abseil-cpp: diff --git a/development/bazel/abseil-missing-stdint.patch b/development/bazel/abseil-missing-stdint.patch new file mode 100644 index 00000000000..725a8925a36 --- /dev/null +++ b/development/bazel/abseil-missing-stdint.patch @@ -0,0 +1,10 @@ +--- abseil-cpp.orig/absl/strings/internal/str_format/extension.h ++++ abseil-cpp/absl/strings/internal/str_format/extension.h +@@ -26,6 +26,7 @@ + #include "absl/base/port.h" + #include "absl/meta/type_traits.h" + #include "absl/strings/internal/str_format/output.h" ++#include + #include "absl/strings/string_view.h" + + namespace absl { diff --git a/development/bazel/apply-abseil-stdint.patch b/development/bazel/apply-abseil-stdint.patch new file mode 100644 index 00000000000..b5065aa1b65 --- /dev/null +++ b/development/bazel/apply-abseil-stdint.patch @@ -0,0 +1,13 @@ +--- distdir_deps.bzl.orig 2023-09-05 16:10:13.000617742 +0900 ++++ distdir_deps.bzl 2023-09-05 16:10:42.471484181 +0900 +@@ -163,6 +163,10 @@ + }, + "com_google_absl": { + "archive": "20211102.0.tar.gz", ++ "patch_args": ["-p1"], ++ "patches": [ ++ "//:abseil-missing-stdint.patch" ++ ], + "sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4", + "urls": [ + "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz", diff --git a/development/bazel/bazel.SlackBuild b/development/bazel/bazel.SlackBuild index 1b6448a1442..7d2cc4610cd 100644 --- a/development/bazel/bazel.SlackBuild +++ b/development/bazel/bazel.SlackBuild @@ -72,6 +72,10 @@ 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 {} \; +# Missing include. +patch -p0 < $CWD/apply-abseil-stdint.patch +cp $CWD/abseil-missing-stdint.patch . + # Export environmental variables # Please change JAVA_HOME if not using zulu-openjdk11 export JAVA_HOME=/usr/lib$LIBDIRSUFFIX/zulu-openjdk11 diff --git a/development/cargo-vendor-filterer/README b/development/cargo-vendor-filterer/README deleted file mode 100644 index 83f96875357..00000000000 --- a/development/cargo-vendor-filterer/README +++ /dev/null @@ -1,10 +0,0 @@ -cargo-vendor-filterer (Vendor rust libraries based on filters) - -cargo-vendor-filterer works like "cargo vendor", but supports filters -that allow excluding libraries one isn't interested in, like -libraries only needed on other platforms, etc. - -NOTE: -I've included a "cargo-mkvendored.sh" script to generate filtered -vendored sources for a rust or python/rust slackbuild. It needs to be -run from within a slackbuild directory. diff --git a/development/cargo-vendor-filterer/cargo-mkvendored.sh b/development/cargo-vendor-filterer/cargo-mkvendored.sh deleted file mode 100644 index 47d498e7a95..00000000000 --- a/development/cargo-vendor-filterer/cargo-mkvendored.sh +++ /dev/null @@ -1,139 +0,0 @@ -#!/bin/bash - -# Create $PRGNAM-vendored-sources-$VERSION-$VSBUILD.tar.xz -# Requires network access, but does not require root privilege. -# Requires that $PRGNAM's REQUIRES need to be installed first (rust-opt) -# and cargo-vendor-filterer installed to include just the linux deps -# -# Expects to be run within a slackbuild dir with the source archive -# already downloaded. -# -# Variables to use in your SlackBuild: -# VSBUILD # same use as BUILD but for vendored sources -# VSDIR=/sub/dir/ # (optional) alternate location in src for vendor dir -# -# Vendors sources for the following targets -# i686-unknown-linux-gnu -# x86_64-unknown-linux-gnu -# arm-unknown-linux-gnueabihf -# aarch64-unknown-linux-gnu - -INFO="$( echo *.info )" -if [ ! -e "$INFO" ]; then - echo "No (or multiple) .info file in current dir" 1>&2 - exit 1 -fi - -SBUILD="$( echo *.SlackBuild )" -if [ ! -e "$SBUILD" ]; then - echo "No (or multiple) .SlackBuild file in current dir" 1>&2 - exit 1 -fi - -CWD=$(pwd) -source ./$INFO - -INFOERR="variable not set, are you sure you have a valid *.info file?" -echo ${PRGNAM:?$INFOERR} -echo VERSION=${VERSION:?$INFOERR} - -set -e -WORKDIR=$( mktemp -d ) -cd $WORKDIR - -# don't depend on user's ~/.cargo -mkdir -p cargohome -export CARGO_HOME=$(pwd)/cargohome - -egrep "^BUILD=|^VSBUILD=|^VSDIR=|^SRCNAM=" $CWD/$SBUILD > sbvars -source ./sbvars - -# if no SRCNAM in slackbuild set to PRGNAM -SRCNAM=${SRCNAM:-$PRGNAM} - -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION/$VSDIR || exit 1 - -if [ ! -e "Cargo.toml" ]; then - echo "No Cargo.toml file in $SRCNAM-$VERSION dir" 1>&2 - exit 1 -elif [ -e "$CWD/Cargo-toml.patch" ]; then - echo "INFO: Applying Cargo.toml patch" - patch -Np1 < $CWD/Cargo-toml.patch -fi - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i686 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -# check if rust-opt is installed -if [ ! -d /opt/rust/bin ]; then - echo "ERROR: The rust-opt slackbuild is required to be installed" - exit 1 -else - export PATH="/opt/rust/bin:$PATH" - if [ -z "$LD_LIBRARY_PATH" ]; then - export LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX" - else - export LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH" - fi -fi - -# Configure cargo-vendor-filterer - cat << EOF >> Cargo.toml -[package.metadata.vendor-filter] -platforms = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu", "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabihf"] -all-features = true -exclude-crate-paths = [ - { name = "openssl-src", exclude = "openssl" }, -] -EOF - -if [ -f /usr/bin/cargo-vendor-filterer ]; then - echo "INFO: Creating filtered vendor libs tarball..." - /usr/bin/cargo-vendor-filterer -else - echo "WARNING: Creating unfiltered vendor libs tarball!" - cargo vendor -fi - -# build would fail if the .a files were removed -#find vendor -type f -a -name \*.a -print0 | xargs -0 rm -f - -mkdir -p .cargo - cat <.cargo/config.toml -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" -EOF -cd - - -cd $WORKDIR -tar cvfJ $CWD/$SRCNAM-vendored-sources-$VERSION-$VSBUILD.tar.xz \ - $SRCNAM-$VERSION/$VSDIR/{vendor,.cargo} -md5sum $CWD/$SRCNAM-vendored-sources-$VERSION-$VSBUILD.tar.xz -cd $CWD -rm -rf $WORKDIR diff --git a/development/cargo-vendor-filterer/cargo-vendor-filterer.SlackBuild b/development/cargo-vendor-filterer/cargo-vendor-filterer.SlackBuild deleted file mode 100644 index c96d532b384..00000000000 --- a/development/cargo-vendor-filterer/cargo-vendor-filterer.SlackBuild +++ /dev/null @@ -1,132 +0,0 @@ -#!/bin/bash - -# Copyright 2023-2024 fourtysixandtwo -# Copyright 2022 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2022 Heinz Wiesinger, Amsterdam, The Netherlands -# 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. - -# 20230925 46and2: Bump build, changes to mkvendored script. -# 20230927 46and2: 32-bit fix thanks to Eugene Carlson. Min ARCH=i686. -# 20240102 46and2: modify to use VSBUILD instead of BUILD for vendored sources -# above requested by Andrew Clemons to avoid CI issues -# -also added VSDIR option to included script, see cargo-mkvendored.sh -# 20240213 46and2: Fix FTB on arm - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=cargo-vendor-filterer -VERSION=${VERSION:-0.5.16} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} -VSBUILD=${VSBUILD:-1} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i686 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -if [ "$ARCH" = "arm" ]; then - TRIPLET="$ARCH-unknown-linux-gnueabihf" -else - TRIPLET="$ARCH-unknown-linux-gnu" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z -tar xvf $CWD/$PRGNAM-vendored-sources-$VERSION-$VSBUILD.tar.?z -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 {} \+ - -export PATH="/opt/rust/bin:$PATH" -if [ -z "$LD_LIBRARY_PATH" ]; then - export LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX" -else - export LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH" -fi - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -OPENSSL_NO_VENDOR=1 \ -cargo build \ - --offline \ - --release \ - --target $TRIPLET - -mkdir -p $PKG/usr/bin -install -m 755 target/$TRIPLET/release/cargo-vendor-filterer \ - $PKG/usr/bin/ - -# add script to generate filtered vendor sources -install -m 755 $CWD/cargo-mkvendored.sh $PKG/usr/bin/ - -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 -cp -a *.md 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 diff --git a/development/cargo-vendor-filterer/cargo-vendor-filterer.info b/development/cargo-vendor-filterer/cargo-vendor-filterer.info deleted file mode 100644 index 0d5b6268384..00000000000 --- a/development/cargo-vendor-filterer/cargo-vendor-filterer.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="cargo-vendor-filterer" -VERSION="0.5.16" -HOMEPAGE="https://github.com/coreos/cargo-vendor-filterer" -DOWNLOAD="https://github.com/coreos/cargo-vendor-filterer/archive/v0.5.16/cargo-vendor-filterer-0.5.16.tar.gz \ - https://slackware.uk/~fourtysixandtwo/src/cargo-vendor-filterer-vendored-sources-0.5.16-1.tar.xz" -MD5SUM="696e453744cd0df6929f33cf266400f2 \ - 1d0b6fa9909130dc06bc21c07cdfd94b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="rust-opt" -MAINTAINER="fourtysixandtwo" -EMAIL="fourtysixandtwo@sliderr.net" diff --git a/development/cargo-vendor-filterer/slack-desc b/development/cargo-vendor-filterer/slack-desc deleted file mode 100644 index 1c8d67c1eff..00000000000 --- a/development/cargo-vendor-filterer/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------------------------------------------------------| -cargo-vendor-filterer: cargo-vendor-filterer (Vendor rust libraries based on filters) -cargo-vendor-filterer: -cargo-vendor-filterer: cargo-vendor-filterer works like "cargo vendor", but supports filters -cargo-vendor-filterer: that allow excluding libraries one isn't interested in, like -cargo-vendor-filterer: libraries only needed on other platforms, etc. -cargo-vendor-filterer: -cargo-vendor-filterer: Homepage: https://github.com/coreos/cargo-vendor-filterer -cargo-vendor-filterer: -cargo-vendor-filterer: -cargo-vendor-filterer: -cargo-vendor-filterer: diff --git a/development/codelite/codelite.SlackBuild b/development/codelite/codelite.SlackBuild index a73a0361d77..8c14bbd4fdb 100644 --- a/development/codelite/codelite.SlackBuild +++ b/development/codelite/codelite.SlackBuild @@ -7,8 +7,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=codelite -VERSION=${VERSION:-15.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-16.0.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/codelite/codelite.info b/development/codelite/codelite.info index c01b8a1ba57..04c9ae1ec96 100644 --- a/development/codelite/codelite.info +++ b/development/codelite/codelite.info @@ -1,8 +1,8 @@ PRGNAM="codelite" -VERSION="15.0" +VERSION="16.0.0" HOMEPAGE="http://www.codelite.org/" -DOWNLOAD="https://github.com/eranif/codelite/archive/15.0/codelite-15.0.tar.gz" -MD5SUM="1c54744ab0c9b5732087687ab17ab49d" +DOWNLOAD="https://github.com/eranif/codelite/archive/16.0.0/codelite-16.0.0.tar.gz" +MD5SUM="0141a38d2f686520d54fd19a6df0fac3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="wxGTK3" diff --git a/development/device-tree-compiler/device-tree-compiler.SlackBuild b/development/device-tree-compiler/device-tree-compiler.SlackBuild index 230558bc538..0c39d23e91b 100644 --- a/development/device-tree-compiler/device-tree-compiler.SlackBuild +++ b/development/device-tree-compiler/device-tree-compiler.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=device-tree-compiler -VERSION=${VERSION:-1.6.1} +VERSION=${VERSION:-1.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -74,7 +74,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z cd $SRCNAM-$VERSION chown -R root:root . find -L . \ @@ -83,11 +83,22 @@ 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-python-destdir-usage.diff - -make -j1 clean -make -j1 CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition" PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} -make -j1 install PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG +patch -p1 < $CWD/libfdt-Fix-build-with-swig-4.3.0.patch + +mkdir build +cd build + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + meson .. \ + --buildtype=release \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --prefix=/usr \ + -Dstrip=true + "${NINJA:=ninja}" + DESTDIR=$PKG $NINJA install +cd .. + +rm -f $PKG/usr/lib$LIBDIRSUFFIX/libfdt.a 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 diff --git a/development/device-tree-compiler/device-tree-compiler.info b/development/device-tree-compiler/device-tree-compiler.info index a25d77bae37..4954dd7dbf9 100644 --- a/development/device-tree-compiler/device-tree-compiler.info +++ b/development/device-tree-compiler/device-tree-compiler.info @@ -1,8 +1,8 @@ PRGNAM="device-tree-compiler" -VERSION="1.6.1" +VERSION="1.7.1" HOMEPAGE="https://git.kernel.org/cgit/utils/dtc/dtc.git" -DOWNLOAD="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/dtc-1.6.1.tar.gz" -MD5SUM="19eef37196e99b659c402a29aac5ba59" +DOWNLOAD="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/dtc-1.7.1.tar.gz" +MD5SUM="75c005766d1b05ea2b04d88a2120d5c1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/device-tree-compiler/fix-python-destdir-usage.diff b/development/device-tree-compiler/fix-python-destdir-usage.diff deleted file mode 100644 index 49b3c14d5b0..00000000000 --- a/development/device-tree-compiler/fix-python-destdir-usage.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur device-tree-compiler-1.6.0.orig/pylibfdt/Makefile.pylibfdt device-tree-compiler-1.6.0/pylibfdt/Makefile.pylibfdt ---- device-tree-compiler-1.6.0.orig/pylibfdt/Makefile.pylibfdt 2020-03-04 00:14:58.000000000 -0600 -+++ device-tree-compiler-1.6.0/pylibfdt/Makefile.pylibfdt 2021-11-06 12:38:30.133022247 -0500 -@@ -22,7 +22,7 @@ - - install_pylibfdt: $(PYMODULE) - @$(VECHO) INSTALL-PYLIB -- $(PYTHON) $(SETUP) $(SETUPFLAGS) install --prefix=$(PREFIX) -+ $(PYTHON) $(SETUP) $(SETUPFLAGS) install --prefix=$(PREFIX) --root=$(DESTDIR) - - pylibfdt_clean: - @$(VECHO) CLEAN "(pylibfdt)" diff --git a/development/device-tree-compiler/libfdt-Fix-build-with-swig-4.3.0.patch b/development/device-tree-compiler/libfdt-Fix-build-with-swig-4.3.0.patch new file mode 100644 index 00000000000..5f101193c8f --- /dev/null +++ b/development/device-tree-compiler/libfdt-Fix-build-with-swig-4.3.0.patch @@ -0,0 +1,32 @@ +https://patchwork.ozlabs.org/project/uboot/patch/Zxzh0ODFyZnav5JE@74d70d9af7e3/ + +diff -Naur dtc-1.7.1.orig/pylibfdt/libfdt.i dtc-1.7.1/pylibfdt/libfdt.i +--- dtc-1.7.1.orig/pylibfdt/libfdt.i 2024-08-17 10:22:16.000000000 +0200 ++++ dtc-1.7.1/pylibfdt/libfdt.i 2024-10-29 12:10:32.145908000 +0100 +@@ -1137,7 +1137,7 @@ + fdt_string(fdt1, fdt32_to_cpu($1->nameoff))); + buff = PyByteArray_FromStringAndSize( + (const char *)($1 + 1), fdt32_to_cpu($1->len)); +- resultobj = SWIG_Python_AppendOutput(resultobj, buff); ++ resultobj = SWIG_AppendOutput(resultobj, buff); + } + } + +@@ -1178,7 +1178,7 @@ + + %typemap(argout) int *depth { + PyObject *val = Py_BuildValue("i", *arg$argnum); +- resultobj = SWIG_Python_AppendOutput(resultobj, val); ++ resultobj = SWIG_AppendOutput(resultobj, val); + } + + %apply int *depth { int *depth }; +@@ -1190,7 +1190,7 @@ + + %typemap(argout) uint64_t * { + PyObject *val = PyLong_FromUnsignedLongLong(*arg$argnum); +- resultobj = SWIG_Python_AppendOutput(resultobj, val); ++ resultobj = SWIG_AppendOutput(resultobj, val); + } + + %include "cstring.i" diff --git a/development/gambas3/gambas-3.19.0-poppler-24.02.0.patch b/development/gambas3/gambas-3.19.0-poppler-24.02.0.patch new file mode 100644 index 00000000000..d97e5796962 --- /dev/null +++ b/development/gambas3/gambas-3.19.0-poppler-24.02.0.patch @@ -0,0 +1,13 @@ +diff -Naur gambas-3.19.0.orig/gb.pdf/src/CPdfDocument.cpp gambas-3.19.0/gb.pdf/src/CPdfDocument.cpp +--- gambas-3.19.0.orig/gb.pdf/src/CPdfDocument.cpp 2024-02-16 00:33:51.000000000 +0100 ++++ gambas-3.19.0/gb.pdf/src/CPdfDocument.cpp 2024-02-17 12:14:47.937408267 +0100 +@@ -776,7 +776,8 @@ + BEGIN_PROPERTY(PDFINDEX_title) + + OutlineItem *item = CPDF_index_get(THIS->currindex); +- return_unicode_string(item->getTitle(), item->getTitleLength()); ++ const std::vector &title = item->getTitle(); ++ return_unicode_string(title.data(), title.size()); + + END_PROPERTY + diff --git a/development/gambas3/gambas3.SlackBuild b/development/gambas3/gambas3.SlackBuild index e6489e950bc..2870558721d 100644 --- a/development/gambas3/gambas3.SlackBuild +++ b/development/gambas3/gambas3.SlackBuild @@ -82,6 +82,8 @@ chown -R root:root . #sed -i -e 's/COMPONENT/COMPONENT_SEARCH/g' -e '/\[src\],/a \ \ odbc,' gb.db.odbc/configure.ac #sed -i -e 's/COMPONENT/COMPONENT_SEARCH/g' -e '/\[src\],/a \ \ odbc,' gb.db2.odbc/configure.ac +patch -p1 < $CWD/gambas-3.19.0-poppler-24.02.0.patch + ./reconf-all CFLAGS="$SLKCFLAGS" \ diff --git a/development/geany-plugins/geany-plugins.SlackBuild b/development/geany-plugins/geany-plugins.SlackBuild index 9f49ddf4eab..d1b05e8d9be 100644 --- a/development/geany-plugins/geany-plugins.SlackBuild +++ b/development/geany-plugins/geany-plugins.SlackBuild @@ -88,7 +88,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 {} \+ -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/development/gnuradio/gnuradio.SlackBuild b/development/gnuradio/gnuradio.SlackBuild index a4aa0192b7a..ae7b2db918e 100644 --- a/development/gnuradio/gnuradio.SlackBuild +++ b/development/gnuradio/gnuradio.SlackBuild @@ -81,6 +81,9 @@ find -L . \ # install docs in the right place sed -i "s|\${GR_DATA_DIR}/doc|doc|" CMakeLists.txt +# fix building with gcc >= 13.x +sed -i s/\#include\ \/\#include\ \\\n\#include\ \/ ./gr-fec/include/gnuradio/fec/alist.h + mkdir -p build cd build cmake \ diff --git a/development/jam/jam.SlackBuild b/development/jam/jam.SlackBuild index f1a115d75ae..5c80ee9c982 100644 --- a/development/jam/jam.SlackBuild +++ b/development/jam/jam.SlackBuild @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=jam -VERSION=${VERSION:-2.5} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.6.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -72,9 +72,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -mkdir -p $PRGNAM-$VERSION -cd $PRGNAM-$VERSION unzip $CWD/$PRGNAM-$VERSION.zip +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -82,6 +81,9 @@ 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 {} \; +# these are from fedora +for i in $CWD/patches/* ; do patch -p1 < $i ; done + make ./jam0 -sBINDIR=$PKG/usr/bin -sOPTIM="$SLKCFLAGS" install strip --strip-unneeded $PKG/usr/bin/jam diff --git a/development/jam/jam.info b/development/jam/jam.info index ffebdf77ad1..7e6015ac5a7 100644 --- a/development/jam/jam.info +++ b/development/jam/jam.info @@ -1,8 +1,8 @@ PRGNAM="jam" -VERSION="2.5" -HOMEPAGE="http://public.perforce.com/public/jam/index.html" -DOWNLOAD="https://www.mirrorservice.org/sites/download.salixos.org/x86_64/extra-14.2/source/development/jam/jam-2.5.zip" -MD5SUM="f92caadb62fe4cb0b152eff508c9d450" +VERSION="2.6.1" +HOMEPAGE="https://swarm.workshop.perforce.com/projects/perforce_software-jam" +DOWNLOAD="https://swarm.workshop.perforce.com/downloads/guest/perforce_software/jam/jam-2.6.1.zip" +MD5SUM="6df59f91da8d3c8ab12de22f3b8c1258" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/jam/patches/01_jam-2.5-overflow.patch b/development/jam/patches/01_jam-2.5-overflow.patch new file mode 100644 index 00000000000..d04d3c59e5c --- /dev/null +++ b/development/jam/patches/01_jam-2.5-overflow.patch @@ -0,0 +1,77 @@ +From: Lubomir Rintel +Subject: [PATCH] Fix stack smashing in variable expansion + +Apparently, Fedora's compiler flags were too long for jam's mind, +resulting in out-of-bounds write on stack. This patch increases length +of variable expansion buffer (and filename buffer, just in case) as +well as adds checks for buffer overflows in some places. + +diff -up jam-2.5/expand.c.overflow jam-2.5/expand.c +--- jam-2.5/expand.c.overflow 2003-04-23 06:45:50.000000000 +0200 ++++ jam-2.5/expand.c 2009-07-25 15:59:30.319767119 +0200 +@@ -27,6 +27,7 @@ + * 10/22/02 (seiwald) - list_new() now does its own newstr()/copystr() + * 11/04/02 (seiwald) - const-ing for string literals + * 12/30/02 (armstrong) - fix out-of-bounds access in var_expand() ++ * 25/07/09 (lkundrak@v3.sk) - fix stack overflows in var_expand() + */ + + # include "jam.h" +@@ -283,8 +284,14 @@ var_expand( + + if( colon && edits.filemods ) + var_edit_file( value->string, out, &edits ); +- else ++ else { ++ if( out + strlen( value->string ) > out_buf + sizeof( out_buf ) ) { ++ fprintf( stderr, "ERROR: String longer than %i characters: '%s' + '%s'\n", ++ sizeof( out_buf ), out, value->string ); ++ exit( 1 ); ++ } + strcpy( out, value->string ); ++ } + + if( colon && ( edits.upshift || edits.downshift ) ) + var_edit_shift( out, &edits ); +@@ -298,6 +305,11 @@ var_expand( + ( list_next( value ) || list_next( vars ) ) ) + { + out += strlen( out ); ++ if( out + strlen( edits.join.ptr ) > out_buf + sizeof( out_buf ) ) { ++ fprintf( stderr, "ERROR: String longer than %i characters: '%s' + '%s'\n", ++ sizeof( out_buf ), out, edits.join.ptr ); ++ exit( 1 ); ++ } + strcpy( out, edits.join.ptr ); + out += strlen( out ); + continue; +@@ -320,6 +332,11 @@ var_expand( + + for( rem = remainder; rem; rem = list_next( rem ) ) + { ++ if( out1 + strlen( rem->string ) > out_buf + sizeof( out_buf ) ) { ++ fprintf( stderr, "ERROR: String longer than %i characters: '%s' + '%s'\n", ++ sizeof( out_buf ), out, rem->string ); ++ exit( 1 ); ++ } + strcpy( out1, rem->string ); + l = list_new( l, out_buf, 0 ); + } +diff -up jam-2.5/jam.h.overflow jam-2.5/jam.h +--- jam-2.5/jam.h.overflow 2004-06-23 19:45:36.000000000 +0200 ++++ jam-2.5/jam.h 2009-07-25 15:59:35.464767132 +0200 +@@ -472,8 +472,12 @@ + + /* You probably don't need to muck with these. */ + +-# define MAXSYM 1024 /* longest symbol in the environment */ +-# define MAXJPATH 1024 /* longest filename */ ++# define MAXSYM 65536 /* longest symbol in the environment */ ++# ifdef PATH_MAX ++# define MAXJPATH PATH_MAX /* longest filename */ ++# else ++# define MAXJPATH 4096 ++# endif + + # define MAXJOBS 64 /* silently enforce -j limit */ + # define MAXARGC 32 /* words in $(JAMSHELL) */ diff --git a/development/jam/patches/02_jam-missing-includes.patch b/development/jam/patches/02_jam-missing-includes.patch new file mode 100644 index 00000000000..29dcbb31894 --- /dev/null +++ b/development/jam/patches/02_jam-missing-includes.patch @@ -0,0 +1,49 @@ +Add missing #include directives to support building in strict(er) +C99 mode. + +diff --git a/execunix.c b/execunix.c +index 6cde87a1b008c54a..83bb8978878be294 100644 +--- a/execunix.c ++++ b/execunix.c +@@ -44,6 +44,8 @@ + # include + + # ifdef USE_EXECUNIX ++# include ++# include + + # ifdef OS_OS2 + # define USE_EXECNT +diff --git a/fileunix.c b/fileunix.c +index 41127a293aca58ea..54014b28c92da4d0 100644 +--- a/fileunix.c ++++ b/fileunix.c +@@ -38,6 +38,7 @@ + # include "pathsys.h" + + # ifdef USE_FILEUNIX ++# include + + # if defined( OS_SEQUENT ) || \ + defined( OS_DGUX ) || \ +@@ -51,7 +52,6 @@ + defined( OS_NEXT ) + /* need unistd for rhapsody's proper lseek */ + # include +-# include + # define STRUCT_DIRENT struct direct + # else + # include +diff --git a/make1.c b/make1.c +index b12ca3cef924da3b..c51dabfd58fb7b63 100644 +--- a/make1.c ++++ b/make1.c +@@ -62,6 +62,8 @@ + # include "command.h" + # include "execcmd.h" + ++# include ++ + static void make1a( TARGET *t, TARGET *parent ); + static void make1b( TARGET *t ); + static void make1c( TARGET *t ); diff --git a/development/jam/patches/03_jam-implicit-int.patch b/development/jam/patches/03_jam-implicit-int.patch new file mode 100644 index 00000000000..0a63a2ba667 --- /dev/null +++ b/development/jam/patches/03_jam-implicit-int.patch @@ -0,0 +1,26 @@ +Add missing int types to enable builds in strict(er) C99 mode. + +diff --git a/jam.c b/jam.c +index 4bc1b90ab48d821d..d3c0c83cae05c4cc 100644 +--- a/jam.c ++++ b/jam.c +@@ -166,6 +166,7 @@ extern char **environ; + # endif + # endif + ++int + main( int argc, char **argv, char **arg_environ ) + { + int n; +diff --git a/mkjambase.c b/mkjambase.c +index 26224c977d206cf5..bcad9af1a5ebc866 100644 +--- a/mkjambase.c ++++ b/mkjambase.c +@@ -24,6 +24,7 @@ + # include + # include + ++int + main( int argc, char **argv, char **envp ) + { + char buf[ 1024 ]; diff --git a/development/jam/patches/04_jam-2.5-argv-fixup.patch b/development/jam/patches/04_jam-2.5-argv-fixup.patch new file mode 100644 index 00000000000..56c73b451a7 --- /dev/null +++ b/development/jam/patches/04_jam-2.5-argv-fixup.patch @@ -0,0 +1,12 @@ +diff -up jam-2.5/execunix.c.fixup jam-2.5/execunix.c +--- jam-2.5/execunix.c.fixup 2024-02-10 07:26:26.720710909 -0500 ++++ jam-2.5/execunix.c 2024-02-10 07:26:47.946025409 -0500 +@@ -104,7 +104,7 @@ execcmd( + { + int pid; + int slot; +- const char *argv[ MAXARGC + 1 ]; /* +1 for NULL */ ++ char * argv[ MAXARGC + 1 ]; /* +1 for NULL */ + + # ifdef USE_EXECNT + char *p; diff --git a/development/jam/patches/05_jam-2.6.1-fix-typo.patch b/development/jam/patches/05_jam-2.6.1-fix-typo.patch new file mode 100644 index 00000000000..92d9a40c0c9 --- /dev/null +++ b/development/jam/patches/05_jam-2.6.1-fix-typo.patch @@ -0,0 +1,12 @@ +diff -up jam-2.6.1/scan.h.fix-typo jam-2.6.1/scan.h +--- jam-2.6.1/scan.h.fix-typo 2024-09-23 10:57:24.703594933 -0400 ++++ jam-2.6.1/scan.h 2024-09-23 10:57:34.888762530 -0400 +@@ -50,7 +50,7 @@ int yyline(); + int yylex(); + int yyparse(); + const char *yyfname(); +-int yylineo(); ++int yylineno(); + + # define SCAN_NORMAL 0 /* normal parsing */ + # define SCAN_STRING 1 /* look only for matching } */ diff --git a/development/jupyter-nbclassic/jupyter-nbclassic.SlackBuild b/development/jupyter-nbclassic/jupyter-nbclassic.SlackBuild index 2548dca07a4..61b6397d8da 100644 --- a/development/jupyter-nbclassic/jupyter-nbclassic.SlackBuild +++ b/development/jupyter-nbclassic/jupyter-nbclassic.SlackBuild @@ -64,16 +64,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 {} \; -# Fix /etc/jupyter path -sed 's|etc|/etc|' -i setup.cfg - -python3 setup.py install --root=$PKG +python -m build --wheel --no-isolation --skip-dependency-check +python -m installer --destdir=$PKG dist/*.whl 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 bundled mathjax2; replace with system mathjax2 -PYTHONPATH=$(python3 -c "from sysconfig import get_path; print(get_path('platlib'))") +PYTHONPATH=$(python3 -c "from sysconfig import get_path; print(get_path('purelib'))") rm -r $PKG/$PYTHONPATH/nbclassic/static/components/MathJax ln -sr /usr/share/mathjax2 $PKG/$PYTHONPATH/nbclassic/static/components/MathJax diff --git a/development/luajit/README b/development/luajit/README deleted file mode 100644 index 2abcd923aff..00000000000 --- a/development/luajit/README +++ /dev/null @@ -1,2 +0,0 @@ -LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming -language. diff --git a/development/luajit/luajit.SlackBuild b/development/luajit/luajit.SlackBuild deleted file mode 100644 index 546316c17a1..00000000000 --- a/development/luajit/luajit.SlackBuild +++ /dev/null @@ -1,125 +0,0 @@ -#!/bin/bash - -# Slackware build script for luajit - -# Copyright 2018 Erik Falor , Logan, Utah, USA -# 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. - -# 20241117 bkw: Modified by SlackBuilds.org: update for v2.1.1731601260, -# since -current just updated. Lousy timing on my part, sorry. Also, use -# self-hosted source so the URL will survive Pat's next update. - -# 20241106 bkw: Modified by SlackBuilds.org: update for v2.1.1727870382, to -# match Slackware -current. - -# 20241017 bkw: Modified by SlackBuilds.org, BUILD=3: remove lua dep, -# it's *not* required. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=luajit -VERSION=${VERSION:-2.1.1731601260} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.lz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + - -# 20241105 bkw: next 2 stanzas come from Pat V's luajit.SlackBuild from -current. -# Enable Lua 5.2 features: -sed -i -e '/-DLUAJIT_ENABLE_LUA52COMPAT/s/^#//' src/Makefile - -# preserve timestamps: -sed -i -e '/install -m/s/-m/-p -m/' Makefile - -LIB=lib$LIBDIRSUFFIX -USRLIB=/usr/$LIB -MAN1=/usr/man/man1 -PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION - -runmake() { - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - make $1 \ - Q= \ - DESTDIR=$2 \ - PREFIX=/usr \ - MULTILIB=$LIB \ - INSTALL_LIB=$2/$USRLIB \ - INSTALL_MAN=$2/$MAN1 -} - -runmake -runmake install $PKG - -rm -f $PKG/$USRLIB/*.a -strip $PKG/usr/bin/$PRGNAM-$VERSION $PKG/$USRLIB/lib$PRGNAM*.so.$VERSION -gzip -9 $PKG/$MAN1/* - -mkdir -p $PKGDOC -cp -a doc/* COPYRIGHT README $PKGDOC -cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$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 diff --git a/development/luajit/luajit.info b/development/luajit/luajit.info deleted file mode 100644 index eb7e6a2a05e..00000000000 --- a/development/luajit/luajit.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="luajit" -VERSION="2.1.1731601260" -HOMEPAGE="http://luajit.org/" -DOWNLOAD="https://slackware.uk/~urchlay/src/luajit-2.1.1731601260.tar.lz" -MD5SUM="cffc7f2e051c50f7fa09eaaac5079ded" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Erik Falor" -EMAIL="ewfalor@gmail.com" diff --git a/development/luajit/slack-desc b/development/luajit/slack-desc deleted file mode 100644 index e5b855ef183..00000000000 --- a/development/luajit/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------------------------------------------------------| -luajit: luajit (just-in-time compiler for Lua) -luajit: -luajit: LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming -luajit: language. -luajit: -luajit: -luajit: -luajit: -luajit: -luajit: Project Homepage: http://luajit.org/ -luajit: diff --git a/development/mysql-workbench/mysql-workbench.SlackBuild b/development/mysql-workbench/mysql-workbench.SlackBuild index 67d2c148e67..9b5c027cf75 100644 --- a/development/mysql-workbench/mysql-workbench.SlackBuild +++ b/development/mysql-workbench/mysql-workbench.SlackBuild @@ -185,6 +185,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Fix for swig >= 4.3.0 +sed -i 's|SWIG_Python_AppendOutput|SWIG_AppendOutput|' library/forms/swig/{cairo,mforms}.i + sed -i '/^\s*set/s| -Werror||' CMakeLists.txt sed -i '/target_compile_options/s|PRIVATE|PRIVATE -fno-lto|' library/sql.parser/source/CMakeLists.txt diff --git a/development/nodejs/README b/development/nodejs/README deleted file mode 100644 index 19aa1057204..00000000000 --- a/development/nodejs/README +++ /dev/null @@ -1,8 +0,0 @@ -Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. - -Node.js uses an event-driven, non-blocking I/O model that makes it -lightweight and efficient. Node.js' package ecosystem, npm, is the -largest ecosystem of open source libraries in the world. - -NOTE: This version uses an internal OpenSSL version instead of -the one provided in Slackware package. diff --git a/development/nodejs/nodejs.SlackBuild b/development/nodejs/nodejs.SlackBuild deleted file mode 100644 index 8d2170fdd20..00000000000 --- a/development/nodejs/nodejs.SlackBuild +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash - -# Slackware build script for nodejs -# Thanks to Audrius Kažukauskas - -# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org -# Willy Sudiarto Raharjo - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version, with the following exception: -# the text of the GPL license may be omitted. - -# This program is distributed in the hope that it will be useful, but -# without any warranty; without even the implied warranty of -# merchantability or fitness for a particular purpose. Compiling, -# interpreting, executing or merely reading the text of the program -# may result in lapses of consciousness and/or very being, up to and -# including the end of all existence and the Universe as we know it. -# See the GNU General Public License for more details. - -# You may have received a copy of the GNU General Public License -# along with this program (most likely, a file named COPYING). If -# not, see . - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=nodejs -SRCNAM=node -VERSION=${VERSION:-20.18.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -eu - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-v$VERSION -tar xvf $CWD/$SRCNAM-v$VERSION.tar.gz -cd $SRCNAM-v$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 {} \; - -## Fix man page path. -sed -i 's|share/||' tools/install.py - -## Fix libdir for 64-bit. -sed -i "s|lib/|lib${LIBDIRSUFFIX}/|g" tools/install.py -sed -i "s/'lib'/'lib${LIBDIRSUFFIX}'/" \ - lib/module.js \ - lib/internal/modules/cjs/loader.js \ - deps/npm/lib/npm.js - -sed -i "s|math.h|cmath|" src/node_crypto.cc -./configure \ - --prefix=/usr \ - --shared-zlib \ - --shared-openssl \ - --ninja - -make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" -make install DESTDIR=$PKG - -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 - -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 - -## Add bash completion file for npm. -install -D -m 644 $CWD/npm.sh $PKG/usr/share/bash-completion/completions/npm - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE *.md $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 diff --git a/development/nodejs/nodejs.info b/development/nodejs/nodejs.info deleted file mode 100644 index cce9ab244d0..00000000000 --- a/development/nodejs/nodejs.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="nodejs" -VERSION="20.18.1" -HOMEPAGE="https://nodejs.org/" -DOWNLOAD="https://nodejs.org/dist/v20.18.1/node-v20.18.1.tar.gz" -MD5SUM="66b4ab021b6929201ea921bd0bd35237" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/development/nodejs/npm.sh b/development/nodejs/npm.sh deleted file mode 100644 index 25bef2c17b4..00000000000 --- a/development/nodejs/npm.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -###-begin-npm-completion-### -# -# npm command completion script -# -# Installation: npm completion >> ~/.bashrc (or ~/.zshrc) -# Or, maybe: npm completion > /usr/local/etc/bash_completion.d/npm -# - -if type complete &>/dev/null; then - _npm_completion () { - local words cword - if type _get_comp_words_by_ref &>/dev/null; then - _get_comp_words_by_ref -n = -n @ -w words -i cword - else - cword="$COMP_CWORD" - words=("${COMP_WORDS[@]}") - fi - - local si="$IFS" - IFS=$'\n' COMPREPLY=($(COMP_CWORD="$cword" \ - COMP_LINE="$COMP_LINE" \ - COMP_POINT="$COMP_POINT" \ - npm completion -- "${words[@]}" \ - 2>/dev/null)) || return $? - IFS="$si" - } - complete -o default -F _npm_completion npm -elif type compdef &>/dev/null; then - _npm_completion() { - local si=$IFS - compadd -- $(COMP_CWORD=$((CURRENT-1)) \ - COMP_LINE=$BUFFER \ - COMP_POINT=0 \ - npm completion -- "${words[@]}" \ - 2>/dev/null) - IFS=$si - } - compdef _npm_completion npm -elif type compctl &>/dev/null; then - _npm_completion () { - local cword line point words si - read -Ac words - read -cn cword - let cword-=1 - read -l line - read -ln point - si="$IFS" - IFS=$'\n' reply=($(COMP_CWORD="$cword" \ - COMP_LINE="$line" \ - COMP_POINT="$point" \ - npm completion -- "${words[@]}" \ - 2>/dev/null)) || return $? - IFS="$si" - } - compctl -K _npm_completion npm -fi -###-end-npm-completion-### diff --git a/development/nodejs/slack-desc b/development/nodejs/slack-desc deleted file mode 100644 index bb106910428..00000000000 --- a/development/nodejs/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------------------------------------------------------| -nodejs: nodejs (JavaScript runtime) -nodejs: -nodejs: Node.js is a JavaScript runtime built on Chrome's V8 JavaScript -nodejs: engine. -nodejs: -nodejs: https://nodejs.org/ -nodejs: -nodejs: -nodejs: -nodejs: -nodejs: diff --git a/development/numpy-legacy/numpy-legacy.SlackBuild b/development/numpy-legacy/numpy-legacy.SlackBuild index a96eb39643a..8abc50265f5 100644 --- a/development/numpy-legacy/numpy-legacy.SlackBuild +++ b/development/numpy-legacy/numpy-legacy.SlackBuild @@ -150,7 +150,7 @@ case "$DEBUG" in esac if [ ! "$DEBUG" ]; then - NPY_RELAXED_STRIDES_CHECKING=${NPY_RSC:-1} python setup.py install --root $PKG + NPY_RELAXED_STRIDES_CHECKING=${NPY_RSC:-1} CFLAGS="-fpermissive" python2 setup.py install --root $PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/development/oneTBB/includes.patch b/development/oneTBB/includes.patch new file mode 100644 index 00000000000..4e831986184 --- /dev/null +++ b/development/oneTBB/includes.patch @@ -0,0 +1,10 @@ +--- oneTBB-2021.6.0.orig/test/common/utils_assert.h 2023-07-24 20:21:49.362670251 +0900 ++++ oneTBB-2021.6.0/test/common/utils_assert.h 2023-07-24 20:22:27.350547548 +0900 +@@ -19,6 +19,7 @@ + + #include "config.h" + #include "utils_report.h" ++#include + + #define REPORT_FATAL_ERROR REPORT + diff --git a/development/oneTBB/oneTBB.SlackBuild b/development/oneTBB/oneTBB.SlackBuild index f74fb0ca6c1..6288ed11c38 100644 --- a/development/oneTBB/oneTBB.SlackBuild +++ b/development/oneTBB/oneTBB.SlackBuild @@ -77,6 +77,10 @@ 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 {} \; +# Missing include +patch -p1 < $CWD/includes.patch +# Remove unused variables (upstream 17b7834, 274f68e) +patch -p1 < $CWD/unused.patch # enable Python if [ "${PYTHON:-no}" == "yes" ];then @@ -85,6 +89,8 @@ fi mkdir -p build cd build +CC=/usr/bin/clang \ +CXX=/usr/bin/clang++ \ cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ diff --git a/development/oneTBB/unused.patch b/development/oneTBB/unused.patch new file mode 100644 index 00000000000..92ab7dd1bec --- /dev/null +++ b/development/oneTBB/unused.patch @@ -0,0 +1,39 @@ +--- oneTBB-2021.6.0.orig/test/conformance/conformance_flowgraph.h 2023-12-17 14:34:12.234366082 +0900 ++++ oneTBB-2021.6.0/test/conformance/conformance_flowgraph.h 2023-12-17 15:27:02.512416476 +0900 +@@ -79,8 +79,9 @@ + template + typename std::enable_if::value, std::vector>::type get_values( test_push_receiver& rr ) { + std::vector messages; +- int val = 0; +- for(V tmp(0); rr.try_get(tmp); ++val) { ++ V tmp(0); ++ ++ while (rr.try_get(tmp)) { + messages.push_back(tmp); + } + return messages; +@@ -89,8 +90,9 @@ + template + typename std::enable_if::value, std::vector>::type get_values( test_push_receiver& rr ) { + std::vector messages; +- int val = 0; +- for(V tmp; rr.try_get(tmp); ++val) { ++ V tmp; ++ ++ while (rr.try_get(tmp)) { + messages.push_back(tmp); + } + return messages; +--- oneTBB-2021.6.0.orig/test/conformance/conformance_join_node.cpp 2023-12-17 14:34:12.235366077 +0900 ++++ oneTBB-2021.6.0/test/conformance/conformance_join_node.cpp 2023-12-17 15:45:20.864114506 +0900 +@@ -28,8 +28,8 @@ + + std::vector get_values( conformance::test_push_receiver& rr ) { + std::vector messages; +- int val = 0; +- for(my_input_tuple tmp(0, 0.f, input_msg(0)); rr.try_get(tmp); ++val) { ++ my_input_tuple tmp(0, 0.f, input_msg(0)); ++ while(rr.try_get(tmp)) { + messages.push_back(tmp); + } + return messages; diff --git a/development/pahole/README b/development/pahole/README deleted file mode 100644 index 364ff6ed673..00000000000 --- a/development/pahole/README +++ /dev/null @@ -1,2 +0,0 @@ -pahole shows data structure layouts encoded in debugging information -formats, DWARF and CTF being supported. diff --git a/development/pahole/pahole.SlackBuild b/development/pahole/pahole.SlackBuild deleted file mode 100644 index f58be6e4933..00000000000 --- a/development/pahole/pahole.SlackBuild +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/bash - -# Slackware build script for pahole - -# Copyright 2019-2023 xaizek -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=pahole -VERSION=${VERSION:-1.27} -LIBBPF_VER="${LIBBPF_VER:-6597330c45d185381900037f0130712cd326ae59}" -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -rm -rf libbpf-$LIBBPF_VER -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z -tar xvf $CWD/libbpf-$LIBBPF_VER.tar.?z -rmdir $PRGNAM-$VERSION/lib/bpf -mv libbpf-$LIBBPF_VER $PRGNAM-$VERSION/lib/bpf -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 {} \; - -# -DDW_LANG_Haskell is a workaround for macro rename in /usr/include/dwarf.h -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -DDW_LANG_Haskell=DW_LANG_Haskel" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -D__LIB="lib${LIBDIRSUFFIX}" \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -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/man - -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 - -# README.ctracer seems to be the only useful README -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - COPYING NEWS README.ctracer \ - $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 diff --git a/development/pahole/pahole.info b/development/pahole/pahole.info deleted file mode 100644 index 3778e5a089a..00000000000 --- a/development/pahole/pahole.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="pahole" -VERSION="1.27" -HOMEPAGE="https://git.kernel.org/pub/scm/devel/pahole/pahole.git/" -DOWNLOAD="https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-1.27.tar.gz \ - https://github.com/libbpf/libbpf/archive/6597330c45d185381900037f0130712cd326ae59/libbpf-6597330c45d185381900037f0130712cd326ae59.tar.gz" -MD5SUM="609e3ea50e86e6a31b7c2569ae8ef80d \ - 85b09e49a18f70056886ab13487231fb" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="xaizek" -EMAIL="xaizek@posteo.net" diff --git a/development/pahole/slack-desc b/development/pahole/slack-desc deleted file mode 100644 index 26f5300a20b..00000000000 --- a/development/pahole/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------------------------------------------------------| -pahole: pahole (shows and manipulates program's data structure layout) -pahole: -pahole: pahole shows data structure layouts encoded in debugging information -pahole: formats, DWARF and CTF being supported. -pahole: -pahole: This is useful for, among other things: optimizing important data -pahole: structures by reducing their size, figuring out what is the field -pahole: sitting at an offset from the start of a data structure, investigating -pahole: ABI changes and more generally understanding a new codebase you have -pahole: to work with. -pahole: diff --git a/development/protobuf3/README b/development/protobuf3/README deleted file mode 100644 index c0fe34acc04..00000000000 --- a/development/protobuf3/README +++ /dev/null @@ -1,27 +0,0 @@ -protobuf3 (Google's data interchange format) - -Protocol buffers are a flexible, efficient, automated mechanism for -serializing structured data. - -This package contains protobuf API version 3. -It support the following language implementations: -* C++ -* Java -* Python -* Objective-C -* C# -* JavaNano -* JavaScript -* Ruby -* Go -* PHP (Alpha) - -The complete documentation for Protocol Buffers is available at: -https://developers.google.com/protocol-buffers/ - -Notes: -* The protobuf build (API version 2) has been removed from - SlackBuilds.org, because nothing uses it any longer and it - conflicted with this build. -* Protobuf3 enforces strict UTF-8 checking. - Parsing will fail if a string field contains non UTF-8 data. diff --git a/development/protobuf3/protobuf3.SlackBuild b/development/protobuf3/protobuf3.SlackBuild deleted file mode 100644 index 80da1d500a9..00000000000 --- a/development/protobuf3/protobuf3.SlackBuild +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/bash - -# Slackware build script for protobuf3 - -# Copyright 2017-2024 Willy Sudiarto Raharjo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=protobuf3 -VERSION=${VERSION:-28.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -GTEST=googletest-release -GTESTVERSION=${GTESTVERSION:-1.8.1} - -SRCNAM=protobuf - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$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 {} \; - -patch -p1 < $CWD/soversion.patch - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -Dprotobuf_BUILD_TESTS=OFF \ - -Dprotobuf_ABSL_PROVIDER=package \ - -Dprotobuf_BUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install/strip DESTDIR=$PKG -cd .. - -# Install the python bindings: -tar xvf $CWD/$SRCNAM-5.$VERSION.tar.gz -cd $SRCNAM-5.$VERSION -LDFLAGS+=" -L$TMP/$SRCNAM-$VERSION/build" \ -PROTOC="$TMP/$SRCNAM-$VERSION/build/protoc" \ -python3 -m build --wheel --no-isolation -python3 -m installer --destdir "$PKG" dist/*.whl -cd .. - -rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la - -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 -cp -a *.txt LICENSE *.md $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 diff --git a/development/protobuf3/protobuf3.info b/development/protobuf3/protobuf3.info deleted file mode 100644 index 6d68af74829..00000000000 --- a/development/protobuf3/protobuf3.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="protobuf3" -VERSION="28.3" -HOMEPAGE="https://github.com/google/protobuf" -DOWNLOAD="https://github.com/google/protobuf/archive/v28.3/protobuf-28.3.tar.gz \ -https://files.pythonhosted.org/packages/74/6e/e69eb906fddcb38f8530a12f4b410699972ab7ced4e21524ece9d546ac27/protobuf-5.28.3.tar.gz" -MD5SUM="e1ddab27d3904d06a96d2f7b8535e3ad \ -1464ff8f06c5d9b4f26613ad9a408f9d" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="abseil-cpp python3-build python3-wheel" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/development/protobuf3/slack-desc b/development/protobuf3/slack-desc deleted file mode 100644 index 440a1c6d9a1..00000000000 --- a/development/protobuf3/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------------------------------------------------------| -protobuf3: protobuf3 (Google's data interchange format) -protobuf3: -protobuf3: Protocol Buffers are Google's language-neutral, platform-neutral, -protobuf3: extensible mechanism for serializing structured data. -protobuf3: -protobuf3: This package contains protobuf API version 3. -protobuf3: -protobuf3: -protobuf3: Project URL: https://github.com/google/protobuf -protobuf3: -protobuf3: diff --git a/development/protobuf3/soversion.patch b/development/protobuf3/soversion.patch deleted file mode 100644 index 7e1b42de12d..00000000000 --- a/development/protobuf3/soversion.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/cmake/libprotobuf-lite.cmake b/cmake/libprotobuf-lite.cmake -index 9b1de677b4f..276c99c489e 100644 ---- a/cmake/libprotobuf-lite.cmake -+++ b/cmake/libprotobuf-lite.cmake -@@ -30,6 +30,7 @@ if(protobuf_BUILD_SHARED_LIBS) - endif() - set_target_properties(libprotobuf-lite PROPERTIES - VERSION ${protobuf_VERSION} -+ SOVERSION ${protobuf_VERSION_MINOR} - OUTPUT_NAME ${LIB_PREFIX}protobuf-lite - DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") - add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite) -diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake -index aa3efc9a68a..0f34d20b97d 100644 ---- a/cmake/libprotobuf.cmake -+++ b/cmake/libprotobuf.cmake -@@ -33,6 +33,7 @@ if(protobuf_BUILD_SHARED_LIBS) - endif() - set_target_properties(libprotobuf PROPERTIES - VERSION ${protobuf_VERSION} -+ SOVERSION ${protobuf_VERSION_MINOR} - OUTPUT_NAME ${LIB_PREFIX}protobuf - DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") - add_library(protobuf::libprotobuf ALIAS libprotobuf) -diff --git a/cmake/libprotoc.cmake b/cmake/libprotoc.cmake -index 72b4a1abb92..91e8bbeb04e 100644 ---- a/cmake/libprotoc.cmake -+++ b/cmake/libprotoc.cmake -@@ -24,6 +24,7 @@ endif() - set_target_properties(libprotoc PROPERTIES - COMPILE_DEFINITIONS LIBPROTOC_EXPORTS - VERSION ${protobuf_VERSION} -+ SOVERSION ${protobuf_VERSION_MINOR} - OUTPUT_NAME ${LIB_PREFIX}protoc - DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") - add_library(protobuf::libprotoc ALIAS libprotoc) diff --git a/development/rust-opt/README b/development/rust-opt/README deleted file mode 100644 index 629c000426f..00000000000 --- a/development/rust-opt/README +++ /dev/null @@ -1,21 +0,0 @@ -rust-opt installs a limited set of Rust stable binaries to /opt/rust. -This is to allow Rust-based SlackBuilds to build more recent versions -than would be possible with system Rust. - -To use the rust-opt binaries in a SlackBuild, make the following export -statements: - -export PATH="/opt/rust/bin:$PATH" -if [ -z "$LD_LIBRARY_PATH" ]; then - export LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX" -else - export LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH" -fi - -If your SlackBuild experiences build failures on 64-bit systems, please -ensure that the LIBDIRSUFFIX variable is set. - -rust-opt is not intended as a substitute for rustup or for the Slackware -Rust package in terms of Rust development purposes. - -Separate downloads are available for x86_64, i686 and ARM. diff --git a/development/rust-opt/rust-opt.SlackBuild b/development/rust-opt/rust-opt.SlackBuild deleted file mode 100644 index cc65330f8d6..00000000000 --- a/development/rust-opt/rust-opt.SlackBuild +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/bash - -# Slackware build script for rust-opt - -# Copyright 2024 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=rust-opt -SRCNAM=rust -VERSION=${VERSION:-1.82.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac - - if [ "$ARCH" = "i586" ]; then - if rustc -Vv | grep host | grep -q i686; then - ARCH=i686 - fi - fi -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" -else - LIBDIRSUFFIX="" -fi - -if [ "$ARCH" = "arm" ]; then - TRIPLET="$ARCH-unknown-linux-gnueabihf" -else - TRIPLET="$ARCH-unknown-linux-gnu" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION-$TRIPLET -tar xvf $CWD/$SRCNAM-$VERSION-$TRIPLET.tar.gz -cd $SRCNAM-$VERSION-$TRIPLET - -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 {} \; - -sed -i "s/PREFIX\/lib/PREFIX\/lib$LIBDIRSUFFIX/g" install.sh -./install.sh \ - --destdir=$PKG \ - --prefix="opt/$SRCNAM" \ - --disable-ldconfig \ - --without=clippy-preview,\ -llvm-bitcode-linker-preview,\ -llvm-tools-preview,\ -rls-preview,\ -rust-analysis-$TRIPLET,\ -rust-analyzer-preview,\ -rust-docs,\ -rust-docs-json-preview,\ -rustfmt-preview - -find $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX -type f -name "*.so" -exec chmod +x {} \; 2> /dev/null -find $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX -type f -name "*.so*stable" -exec chmod +x {} \; 2> /dev/null - -# Stripping the libraries causes memory faults on Slackware64-15.0. -if [ $ARCH = "x86_64" ]; then - find $PKG -print0 | xargs -0 file | grep "executable" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -else - 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 -fi - -rm -f $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX/rustlib/uninstall.sh -rm -f $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX/rustlib/install.log -rm -f $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX/rustlib/manifest-* -rm -f $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX/rustlib/rust-installer-version -rm -f $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX/rustlib/components - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - $PKG/opt/$SRCNAM/share/doc/* \ - COPYRIGHT LICENSE-APACHE LICENSE-MIT \ - $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc/$PRGNAM-$VERSION -name "*.old" -delete -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.sw - -# Nothing in share is needed at this point. -rm -rf $PKG/opt/$SRCNAM/share -# Don't need bash completions. -rm -rf $PKG/opt/$SRCNAM/etc - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/rust-opt/rust-opt.info b/development/rust-opt/rust-opt.info deleted file mode 100644 index 948abefab4d..00000000000 --- a/development/rust-opt/rust-opt.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="rust-opt" -VERSION="1.82.0" -HOMEPAGE="https://rust-lang.org" -DOWNLOAD="https://static.rust-lang.org/dist/2024-10-17/rust-1.82.0-i686-unknown-linux-gnu.tar.gz \ - https://static.rust-lang.org/dist/2024-10-17/rust-1.82.0-arm-unknown-linux-gnueabihf.tar.gz" -MD5SUM="5d91b7e50cb4301ced86bbe396b14348 \ - e7bc2eb0e03e7d394fe70c821f747bfb" -DOWNLOAD_x86_64="https://static.rust-lang.org/dist/2024-10-17/rust-1.82.0-x86_64-unknown-linux-gnu.tar.gz" -MD5SUM_x86_64="19da7fda722ad73801d16ac21db5f60e" -REQUIRES="" -MAINTAINER="K. Eugene Carlson" -EMAIL="kvngncrlsn@gmail.com" diff --git a/development/rust-opt/slack-desc b/development/rust-opt/slack-desc deleted file mode 100644 index 5ed0a74ba85..00000000000 --- a/development/rust-opt/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------------------------------------------------------| -rust-opt: rust-opt (Rust: a safe, concurrent, practical language) -rust-opt: -rust-opt: rust-opt installs a limited set of up-to-date Rust stable binaries to -rust-opt: /opt/rust for use in SlackBuilds. -rust-opt: -rust-opt: See /usr/doc/rust-opt-1.82.0/README.sw for usage instructions. -rust-opt: -rust-opt: -rust-opt: -rust-opt: -rust-opt: Homepage: https://rust-lang.org diff --git a/development/rust16/README b/development/rust16/README deleted file mode 100644 index 568400110d1..00000000000 --- a/development/rust16/README +++ /dev/null @@ -1,22 +0,0 @@ -rust16 installs a limited set of Rust 1.79.0 binaries to /opt/rust16. -This is to allow Rust-based SlackBuilds requiring version 1.79.0 to -build on release Slackware. For other Rust software, please use -rust-opt instead. - -To use the rust16 binaries in a SlackBuild, make the following export -statements: - -export PATH="/opt/rust16/bin:$PATH" -if [ -z "$LD_LIBRARY_PATH" ]; then - export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX" -else - export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH" -fi - -If your SlackBuild experiences build failures on 64-bit systems, please -ensure that the LIBDIRSUFFIX variable is set. - -rust16 is not intended as a substitute for rustup or for the Slackware -Rust package in terms of Rust development purposes. - -Separate downloads are available for i686 and x86_64. diff --git a/development/rust16/rust16.SlackBuild b/development/rust16/rust16.SlackBuild deleted file mode 100644 index bf7e04f9c68..00000000000 --- a/development/rust16/rust16.SlackBuild +++ /dev/null @@ -1,142 +0,0 @@ -#!/bin/bash - -# Slackware build script for rust16 - -# Copyright 2023-2024 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. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=rust16 -SRCNAM=rust -VERSION=${VERSION:-1.79.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac - - if [ "$ARCH" = "i586" ]; then - if rustc -Vv | grep host | grep -q i686; then - ARCH=i686 - fi - fi -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" -else - LIBDIRSUFFIX="" -fi - -if [ "$ARCH" = "arm" ]; then - TRIPLET="$ARCH-unknown-linux-gnueabihf" -else - TRIPLET="$ARCH-unknown-linux-gnu" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION-$TRIPLET -tar xvf $CWD/$SRCNAM-$VERSION-$TRIPLET.tar.gz -cd $SRCNAM-$VERSION-$TRIPLET -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 {} \; - -./install.sh \ - --destdir=$PKG \ - --prefix="opt/rust16" \ - --disable-ldconfig \ - --without=rust-docs-json-preview,\ -rust-docs,\ -clippy-preview,\ -rls-preview,\ -llvm-tools-preview,\ -llvm-bitcode-linker-preview,\ -rust-analysis-$TRIPLET,\ -rust-analyzer-preview,\ -rust-demangler-preview,\ -rustfmt-preview - -find $PKG/opt/$PRGNAM/lib -type f -name "*.so" -exec chmod +x {} \; 2> /dev/null || true -find $PKG/opt/$PRGNAM/lib -type f -name "*.so*stable" -exec chmod +x {} \; 2> /dev/null || true -# Stripping the libraries causes memory faults on Slackware64-15.0. -if [ $ARCH = "x86_64" ]; then - find $PKG -print0 | xargs -0 file | grep "executable" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -else - 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 -fi - -rm -f $PKG/opt/$PRGNAM/lib/rustlib/uninstall.sh -rm -f $PKG/opt/$PRGNAM/lib/rustlib/install.log -rm -f $PKG/opt/$PRGNAM/lib/rustlib/manifest-* -rm -f $PKG/opt/$PRGNAM/lib/rustlib/rust-installer-version -rm -f $PKG/opt/$PRGNAM/lib/rustlib/components - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - $PKG/opt/$PRGNAM/share/doc/* \ - COPYRIGHT LICENSE-APACHE LICENSE-MIT \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.sw - -# Nothing in share is needed at this point. -rm -rf $PKG/opt/$PRGNAM/share -# Don't need bash completions. -rm -rf $PKG/opt/$PRGNAM/etc -# Appropriate directory name for the lib dir. -[ -n "$LIBDIRSUFFIX" ] && mv $PKG/opt/$PRGNAM/lib $PKG/opt/$PRGNAM/lib$LIBDIRSUFFIX - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/development/rust16/rust16.info b/development/rust16/rust16.info deleted file mode 100644 index 43d765fe6f3..00000000000 --- a/development/rust16/rust16.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="rust16" -VERSION="1.79.0" -HOMEPAGE="https://rust-lang.org" -DOWNLOAD="https://static.rust-lang.org/dist/2024-06-13/rust-1.79.0-i686-unknown-linux-gnu.tar.gz \ - https://static.rust-lang.org/dist/2024-06-13/rust-1.79.0-arm-unknown-linux-gnueabihf.tar.gz" -MD5SUM="14d04dfa5b8db0e4c60b3ca510413154 \ - b935f3d193c8618d9bfe3ab97ad99d4e" -DOWNLOAD_x86_64="https://static.rust-lang.org/dist/2024-06-13/rust-1.79.0-x86_64-unknown-linux-gnu.tar.gz" -MD5SUM_x86_64="6f2d7072b8bcd817f9effa0c504e31e9" -REQUIRES="" -MAINTAINER="K. Eugene Carlson" -EMAIL="kvngncrlsn@gmail.com" diff --git a/development/rust16/slack-desc b/development/rust16/slack-desc deleted file mode 100644 index 1b21a06dce9..00000000000 --- a/development/rust16/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------------------------------------------------------| -rust16: rust16 (Rust: a safe, concurrent, practical language) -rust16: -rust16: rust16 installs a limited set of Rust 1.79.0 binaries to /opt/rust16 -rust16: for use in SlackBuilds. -rust16: -rust16: -rust16: -rust16: -rust16: -rust16: -rust16: Homepage: https://rust-lang.org diff --git a/development/splint/splint.SlackBuild b/development/splint/splint.SlackBuild index e7cf5025a83..1f0b956521c 100644 --- a/development/splint/splint.SlackBuild +++ b/development/splint/splint.SlackBuild @@ -67,10 +67,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 {} \; -automake --add-missing || true -autoreconf || true -automake --add-missing -autoreconf +autoreconf -vif CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/development/systemtap/int.patch b/development/systemtap/int.patch deleted file mode 100644 index b412a518942..00000000000 --- a/development/systemtap/int.patch +++ /dev/null @@ -1,48 +0,0 @@ -Lockywolf - -diff -Naur systemtap-4.5.orig/staprun/monitor.c systemtap-4.5/staprun/monitor.c ---- systemtap-4.5.orig/staprun/monitor.c 2021-05-07 21:20:39.000000000 +0200 -+++ systemtap-4.5/staprun/monitor.c 2021-10-15 11:57:04.770964000 +0200 -@@ -448,12 +448,12 @@ - if (active_window == 0) - wattron(status, A_BOLD); - wprintw(status, "\n%*s\t%*s\t%*s\t%*s\t%*s\t%*s\t%s\n", -- width[p_index], HIGHLIGHT("index", p_index, comp_fn_index), -- width[p_state], HIGHLIGHT("state", p_state, comp_fn_index), -- width[p_hits], HIGHLIGHT("hits", p_hits, comp_fn_index), -- width[p_min], HIGHLIGHT("min", p_min, comp_fn_index), -- width[p_avg], HIGHLIGHT("avg", p_avg, comp_fn_index), -- width[p_max], HIGHLIGHT("max", p_max, comp_fn_index), -+ (int)width[p_index], HIGHLIGHT("index", p_index, comp_fn_index), -+ (int)width[p_state], HIGHLIGHT("state", p_state, comp_fn_index), -+ (int)width[p_hits], HIGHLIGHT("hits", p_hits, comp_fn_index), -+ (int)width[p_min], HIGHLIGHT("min", p_min, comp_fn_index), -+ (int)width[p_avg], HIGHLIGHT("avg", p_avg, comp_fn_index), -+ (int)width[p_max], HIGHLIGHT("max", p_max, comp_fn_index), - HIGHLIGHT("name", p_name, comp_fn_index)); - if (active_window == 0) - wattroff(status, A_BOLD); -@@ -466,17 +466,17 @@ - json_object *probe, *field; - probe = json_object_array_get_idx(jso_probe_list, i); - json_object_object_get_ex(probe, "index", &field); -- wprintw(status, "%*s\t", width[p_index], json_object_get_string(field)); -+ wprintw(status, "%*s\t", (int)width[p_index], json_object_get_string(field)); - json_object_object_get_ex(probe, "state", &field); -- wprintw(status, "%*s\t", width[p_state], json_object_get_string(field)); -+ wprintw(status, "%*s\t", (int)width[p_state], json_object_get_string(field)); - json_object_object_get_ex(probe, "hits", &field); -- wprintw(status, "%*s\t", width[p_hits], json_object_get_string(field)); -+ wprintw(status, "%*s\t", (int)width[p_hits], json_object_get_string(field)); - json_object_object_get_ex(probe, "min", &field); -- wprintw(status, "%*s\t", width[p_min], json_object_get_string(field)); -+ wprintw(status, "%*s\t", (int)width[p_min], json_object_get_string(field)); - json_object_object_get_ex(probe, "avg", &field); -- wprintw(status, "%*s\t", width[p_avg], json_object_get_string(field)); -+ wprintw(status, "%*s\t", (int)width[p_avg], json_object_get_string(field)); - json_object_object_get_ex(probe, "max", &field); -- wprintw(status, "%*s\t", width[p_max], json_object_get_string(field)); -+ wprintw(status, "%*s\t", (int)width[p_max], json_object_get_string(field)); - getyx(status, discard, cur_x); - json_object_object_get_ex(probe, "name", &field); - wprintw(status, "%.*s", max_cols-cur_x-1, json_object_get_string(field)); diff --git a/development/systemtap/systemtap.SlackBuild b/development/systemtap/systemtap.SlackBuild index 62eff9de5be..8e3c6604f8d 100644 --- a/development/systemtap/systemtap.SlackBuild +++ b/development/systemtap/systemtap.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=systemtap -VERSION=${VERSION:-4.5} +VERSION=${VERSION:-5.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -80,8 +80,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/int.patch - export PYTHON=python3 CFLAGS="$SLKCFLAGS" \ diff --git a/development/systemtap/systemtap.info b/development/systemtap/systemtap.info index e8be62cd34f..3d8c1c4f2d0 100644 --- a/development/systemtap/systemtap.info +++ b/development/systemtap/systemtap.info @@ -1,8 +1,8 @@ PRGNAM="systemtap" -VERSION="4.5" +VERSION="5.1" HOMEPAGE="https://sourceware.org/systemtap/" -DOWNLOAD="https://sourceware.org/systemtap/ftp/releases/systemtap-4.5.tar.gz" -MD5SUM="39369e2aa08636ea6600464e9fdc5185" +DOWNLOAD="https://sourceware.org/systemtap/ftp/releases/systemtap-5.1.tar.gz" +MD5SUM="d4f8d8f2ed09031a9a284e894c95103e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/unittest-cpp/unittest-cpp.SlackBuild b/development/unittest-cpp/unittest-cpp.SlackBuild index 061e9fea38e..223216bb2e1 100644 --- a/development/unittest-cpp/unittest-cpp.SlackBuild +++ b/development/unittest-cpp/unittest-cpp.SlackBuild @@ -84,7 +84,7 @@ mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=uninitialized" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release .. diff --git a/development/valgrind/README b/development/valgrind/README deleted file mode 100644 index 7e4eec3411a..00000000000 --- a/development/valgrind/README +++ /dev/null @@ -1,19 +0,0 @@ -Valgrind is a framework for building dynamic analysis tools. There are -Valgrind tools that can automatically detect many memory management -and threading bugs, and profile your programs in detail. You can also -use Valgrind to build new tools. - -The Valgrind distribution currently includes six production-quality -tools: a memory error detector, two thread error detectors, a cache -and branch-prediction profiler, a call-graph generating cache and -branch-prediction profiler, and a heap profiler. It also includes -three experimental tools: a heap/stack/global array overrun detector, -a different kind of heap profiler, and a SimPoint basic block vector -generator. It runs on the following platforms: x86/Linux, AMD64/Linux, -PPC32/Linux, PPC64/Linux, ARM/Linux, x86/MacOSX and AMD64/MacOSX. - -Optional dependency: either mpich or openmpi. If one of these is -found, valgrind will include the MPI wrapper, which allows using -valgrind with software that uses the MPI message passing standard. -Note that only one of mpich or openmpi should be installed, as they -conflict with each other. diff --git a/development/valgrind/slack-desc b/development/valgrind/slack-desc deleted file mode 100644 index 5129787498e..00000000000 --- a/development/valgrind/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------------------------------------------------------| -valgrind: valgrind (award-winning suite of tools for debugging) -valgrind: -valgrind: Valgrind is an award-winning suite of tools for debugging and -valgrind: profiling Linux programs. With the tools that come with Valgrind, -valgrind: you can automatically detect many memory management and threading -valgrind: bugs, avoiding hours of frustrating bug-hunting, making your -valgrind: programs more stable. You can also perform detailed profiling, -valgrind: to speed up and reduce memory use of your programs. -valgrind: -valgrind: -valgrind: diff --git a/development/valgrind/valgrind.SlackBuild b/development/valgrind/valgrind.SlackBuild deleted file mode 100644 index a8fa68bb57e..00000000000 --- a/development/valgrind/valgrind.SlackBuild +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash - -# Slackware build script for valgrind -# Written by Kyle Guinn -# Updated by Peter Wang -# Maintained by Willy Sudiarto Raharjo - -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=valgrind -VERSION=${VERSION:-3.24.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - # The valgrind build system already passes -fpic - # and forcing -fPIC results in a build failure. - SLKCFLAGS="-O2" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -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 -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 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -# Do NOT strip the shared objects, as recommended by the developers. -find $PKG -print0 | xargs -0 file | grep -e "executable" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -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 AUTHORS COPYING* FAQ.txt NEWS README* \ - $PKG/usr/doc/$PRGNAM-$VERSION -mv $PKG/usr/share/doc/valgrind/html $PKG/usr/doc/$PRGNAM-$VERSION -# The doc directory is the only thing in $PKG/usr/share, and the only things -# left in it now are pdf and a ps doc files. They are large, so we won't keep -# them around. If you still want them, uncomment the line below. -# mv $PKG/usr/share/doc/valgrind/*.{ps,pdf} $PKG/usr/doc/$PRGNAM-$VERSION -rm -rf $PKG/usr/share -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 diff --git a/development/valgrind/valgrind.info b/development/valgrind/valgrind.info deleted file mode 100644 index 2a8ae1012cd..00000000000 --- a/development/valgrind/valgrind.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="valgrind" -VERSION="3.24.0" -HOMEPAGE="http://www.valgrind.org/" -DOWNLOAD="http://sourceware.org/pub/valgrind/valgrind-3.24.0.tar.bz2" -MD5SUM="7ae7ffc6b3cff48fe35076266c128226" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/development/vc-intrinsics/vc-intrinsics.SlackBuild b/development/vc-intrinsics/vc-intrinsics.SlackBuild index ef9d2f1a1c9..cb18b02a02f 100644 --- a/development/vc-intrinsics/vc-intrinsics.SlackBuild +++ b/development/vc-intrinsics/vc-intrinsics.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vc-intrinsics -VERSION=${VERSION:-0.7.1} +VERSION=${VERSION:-0.18.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/development/vc-intrinsics/vc-intrinsics.info b/development/vc-intrinsics/vc-intrinsics.info index 73886671ce8..c872982f040 100644 --- a/development/vc-intrinsics/vc-intrinsics.info +++ b/development/vc-intrinsics/vc-intrinsics.info @@ -1,8 +1,8 @@ PRGNAM="vc-intrinsics" -VERSION="0.7.1" +VERSION="0.18.0" HOMEPAGE="https://github.com/intel/vc-intrinsics" -DOWNLOAD="https://github.com/intel/vc-intrinsics/archive/v0.7.1/vc-intrinsics-0.7.1.tar.gz" -MD5SUM="80cb159761b289b2c33495de139c6630" +DOWNLOAD="https://github.com/intel/vc-intrinsics/archive/v0.18.0/vc-intrinsics-0.18.0.tar.gz" +MD5SUM="f75ba44799c015deeb37064039fae0cf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/0ad-data/0ad-data.SlackBuild b/games/0ad-data/0ad-data.SlackBuild index f0e3c224898..c9a70929ef6 100644 --- a/games/0ad-data/0ad-data.SlackBuild +++ b/games/0ad-data/0ad-data.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=0ad-data DATANAM=0ad -VERSION=${VERSION:-0.0.26} +VERSION=${VERSION:-r28035} RELEASE=${RELEASE:-alpha} ARCH=noarch BUILD=${BUILD:-1} diff --git a/games/0ad-data/0ad-data.info b/games/0ad-data/0ad-data.info index 6f9a2ab55cd..6065c561ab3 100644 --- a/games/0ad-data/0ad-data.info +++ b/games/0ad-data/0ad-data.info @@ -1,8 +1,8 @@ PRGNAM="0ad-data" -VERSION="0.0.26" +VERSION="r28035" HOMEPAGE="https://play0ad.com/" -DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.26-alpha-unix-data.tar.xz" -MD5SUM="b023f0f7045dc020f97be6c0df9f9a7e" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/0ad-r28035-alpha-unix-data.tar.xz" +MD5SUM="103758c3fdd8df505d40f8d7eb3b039f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/0ad/0ad.SlackBuild b/games/0ad/0ad.SlackBuild index b6c52e7c619..d79e586be8a 100644 --- a/games/0ad/0ad.SlackBuild +++ b/games/0ad/0ad.SlackBuild @@ -29,9 +29,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=0ad -VERSION=${VERSION:-0.0.26} +VERSION=${VERSION:-r28035} RELEASE=${RELEASE:-alpha} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} TMP=${TMP:-/tmp/SBo} @@ -93,10 +93,6 @@ export SDL2_CONFIG="/usr/bin/sdl2-config" mkdir -p cargoh export CARGO_HOME="$TMP/$PRGNAM-$VERSION-$RELEASE/cargoh" -#add patches for fmt>9.1.0 ie. 10.1.1 -sed -i 's/, header.GetType()/, static_cast(header.GetType())/g' source/network/NetMessage.cpp -sed -i 's/, arrayType/, static_cast(arrayType)/g' source/simulation2/serialization/BinarySerializer.cpp - # Fix boost names, include paths and remove isystem. commented stuff is fixed upstream already sed -i 's|-mt||g' build/premake/extern_libs5.lua || exit 1 #sed -i 's|/usr/local/include|/usr/include|' build/premake/{extern_libs5.lua,premake5.lua} || exit 1 @@ -113,6 +109,9 @@ sed -i 's|-isystem |-I|' build/premake/premake5/{src/tools/gcc.lua,tests/tools/t # have a root check, let's disable it. patch -p1 < $CWD/disable-root-check.patch +sed -i '/Pyrogenesis/i #include ' source/ps/Util.cpp + +CXX=clang++ \ build/workspaces/update-workspaces.sh \ --without-pch \ --bindir=/usr/games \ diff --git a/games/0ad/0ad.info b/games/0ad/0ad.info index 59eb4a4fdf3..f1aaf3606af 100644 --- a/games/0ad/0ad.info +++ b/games/0ad/0ad.info @@ -1,10 +1,10 @@ PRGNAM="0ad" -VERSION="0.0.26" +VERSION="r28035" HOMEPAGE="https://play0ad.com/" -DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.26-alpha-unix-build.tar.xz" -MD5SUM="d0d3ed10769dee2254aa196a9619bd57" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/0ad-r28035-alpha-unix-build.tar.xz" +MD5SUM="45c9ebe38e0578c6eade09da81b10105" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="0ad-data enet fmt gloox miniupnpc wxGTK3" +REQUIRES="0ad-data enet fmt gloox miniupnpc wxWidgets" MAINTAINER="Tim Dickson" EMAIL="dickson.tim@googlemail.com" diff --git a/games/astromenace/astromenace.SlackBuild b/games/astromenace/astromenace.SlackBuild index 111003453d5..e1efecf5811 100644 --- a/games/astromenace/astromenace.SlackBuild +++ b/games/astromenace/astromenace.SlackBuild @@ -79,6 +79,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 {} \; +sed -i s/\#include\ \/\#include\ \\\n\#include\ \/ ./src/core/model3d/model3d.cpp + cmake ./ # create Makefile make # build game diff --git a/games/d1x-rebirth/d1x-rebirth.SlackBuild b/games/d1x-rebirth/d1x-rebirth.SlackBuild index f9b3e8f86cb..f917151022c 100644 --- a/games/d1x-rebirth/d1x-rebirth.SlackBuild +++ b/games/d1x-rebirth/d1x-rebirth.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=d1x-rebirth SRCNAM=dxx-rebirth -VERSION=${VERSION:-20220130_7258b7f} +VERSION=${VERSION:-20230520_695e8b9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/d1x-rebirth/d1x-rebirth.info b/games/d1x-rebirth/d1x-rebirth.info index f20bb59a156..488e219d16a 100644 --- a/games/d1x-rebirth/d1x-rebirth.info +++ b/games/d1x-rebirth/d1x-rebirth.info @@ -1,8 +1,8 @@ PRGNAM="d1x-rebirth" -VERSION="20220130_7258b7f" +VERSION="20230520_695e8b9" HOMEPAGE="https://www.dxx-rebirth.com/" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20220130_7258b7f.tar.xz" -MD5SUM="0aacba8e78a9a5cb5e52a5802604b13f" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20230520_695e8b9.tar.xz" +MD5SUM="20daa2377b7cd13ada79b12da2b762d4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="physfs" diff --git a/games/d2x-rebirth/d2x-rebirth.SlackBuild b/games/d2x-rebirth/d2x-rebirth.SlackBuild index 0cafd4fd74c..1145e2fe587 100644 --- a/games/d2x-rebirth/d2x-rebirth.SlackBuild +++ b/games/d2x-rebirth/d2x-rebirth.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=d2x-rebirth SRCNAM=dxx-rebirth -VERSION=${VERSION:-20220130_7258b7f} +VERSION=${VERSION:-20230520_695e8b9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/d2x-rebirth/d2x-rebirth.info b/games/d2x-rebirth/d2x-rebirth.info index 4c1f7a9b2ef..a35c67c1503 100644 --- a/games/d2x-rebirth/d2x-rebirth.info +++ b/games/d2x-rebirth/d2x-rebirth.info @@ -1,8 +1,8 @@ PRGNAM="d2x-rebirth" -VERSION="20220130_7258b7f" +VERSION="20230520_695e8b9" HOMEPAGE="https://www.dxx-rebirth.com/" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20220130_7258b7f.tar.xz" -MD5SUM="0aacba8e78a9a5cb5e52a5802604b13f" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20230520_695e8b9.tar.xz" +MD5SUM="20daa2377b7cd13ada79b12da2b762d4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="physfs" diff --git a/games/frozen-bubble/frozen-bubble.SlackBuild b/games/frozen-bubble/frozen-bubble.SlackBuild index c5395e63056..d40bebbc935 100644 --- a/games/frozen-bubble/frozen-bubble.SlackBuild +++ b/games/frozen-bubble/frozen-bubble.SlackBuild @@ -82,6 +82,7 @@ find -L . \ # Werror breaks build on current sed -i "s|\ -Werror||" inc/My/Builder.pm +sed -i "s|\ '0\.36'\ =>||" inc/My/Builder.pm perl Build.PL \ prefix=/usr \ diff --git a/games/higan/higan.SlackBuild b/games/higan/higan.SlackBuild index 39d9901f01e..31cd37b92ac 100644 --- a/games/higan/higan.SlackBuild +++ b/games/higan/higan.SlackBuild @@ -116,6 +116,8 @@ chown -R root:root . # for its support files if they're not found in ~/.local/share/higan. patch -p1 -i $CWD/higan-flags.diff patch -p1 -i $CWD/higan-paths.diff +# 20240131 KEC: gcc-13.x compatibility +patch -p1 -i $CWD/includes.diff # 20181212 bkw: audio system stuff. Upstream doesn't give us a way to # disable these on the make command line, but hacking this file works: diff --git a/games/higan/includes.diff b/games/higan/includes.diff new file mode 100644 index 00000000000..09b1a5bc2b8 --- /dev/null +++ b/games/higan/includes.diff @@ -0,0 +1,8 @@ +--- higan-106.orig/nall/arithmetic/natural.hpp 2024-01-31 09:12:37.166634947 +0900 ++++ higan-106/nall/arithmetic/natural.hpp 2024-01-31 09:12:58.147526383 +0900 +@@ -1,3 +1,5 @@ ++#include ++ + #define ConcatenateType(Size) uint##Size##_t + #define DeclareType(Size) ConcatenateType(Size) + diff --git a/games/maelstrom/maelstrom.SlackBuild b/games/maelstrom/maelstrom.SlackBuild index 88cddc94c80..2a0fc29553f 100644 --- a/games/maelstrom/maelstrom.SlackBuild +++ b/games/maelstrom/maelstrom.SlackBuild @@ -80,7 +80,7 @@ sed -i '/GAME_INSTALLDIR=.*games/s,/games,/share/games,' configure # on -current (and it does no harm on 14.2 either): sed -i 's,struct *button,struct b_utton,g' buttonlist.h -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/games/micropolis/micropolis.SlackBuild b/games/micropolis/micropolis.SlackBuild index bd09100122f..b964a874b90 100644 --- a/games/micropolis/micropolis.SlackBuild +++ b/games/micropolis/micropolis.SlackBuild @@ -93,7 +93,7 @@ run_make() { DOCDIR=$DOCDIR \ DATADIR=/usr/share/games/$PRGNAM \ BINDIR=/usr/games \ - SLKCFLAGS="$SLKCFLAGS -DTCL_IEEE_FP_MATH" \ + SLKCFLAGS="$SLKCFLAGS -DTCL_IEEE_FP_MATH -fpermissive" \ DESTDIR=$PKG \ "$@" } diff --git a/games/pokerth/patches/pokerth-1.1.2-boost-1.85.patch b/games/pokerth/patches/pokerth-1.1.2-boost-1.85.patch new file mode 100644 index 00000000000..9f8a1111e49 --- /dev/null +++ b/games/pokerth/patches/pokerth-1.1.2-boost-1.85.patch @@ -0,0 +1,374 @@ +From f42fa9a604f9f4faa1addd1b02c491cd0fe59736 Mon Sep 17 00:00:00 2001 +From: "grover92000@gmail.com" +Date: Sat, 20 Apr 2024 13:29:24 -0400 +Subject: [PATCH] Changes for boost-1.85 + +--- + src/core/common/avatarmanager.cpp | 49 +++++++++++++++++++ + src/core/common/loghelper_server.cpp | 4 ++ + src/engine/log.cpp | 4 ++ + src/engine/log.h | 4 ++ + .../qt/qttools/nonqthelper/nonqthelper.cpp | 8 +++ + src/net/common/clientstate.cpp | 19 +++++++ + src/net/common/clientthread.cpp | 4 ++ + src/net/common/downloaderthread.cpp | 8 +++ + src/net/common/serverlobbythread.cpp | 8 +++ + src/net/common/uploaderthread.cpp | 4 ++ + src/pokerth_server.cpp | 4 ++ + 11 files changed, 116 insertions(+) + +diff --git a/src/core/common/avatarmanager.cpp b/src/core/common/avatarmanager.cpp +index d137a5c44..9b2f4abaa 100644 +--- a/src/core/common/avatarmanager.cpp ++++ b/src/core/common/avatarmanager.cpp +@@ -87,20 +87,36 @@ AvatarManager::Init(const string &dataDir, const string &cacheDir) + path tmpDataPath(dataDir); + { + boost::mutex::scoped_lock lock(m_cacheDirMutex); ++#if BOOST_VERSION < 108500 + m_cacheDir = tmpCachePath.directory_string(); ++#else ++ m_cacheDir = tmpCachePath.string(); ++#endif + } + { + boost::mutex::scoped_lock lock(m_avatarsMutex); ++#if BOOST_VERSION < 108500 + tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/people/").directory_string(), m_avatars); ++#else ++ tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/people/").string(), m_avatars); ++#endif + retVal = retVal && tmpRet; ++#if BOOST_VERSION < 108500 + tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/misc/").directory_string(), m_avatars); ++#else ++ tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/misc/").string(), m_avatars); ++#endif + retVal = retVal && tmpRet; + } + if (cacheDir.empty() || tmpCachePath.empty()) + LOG_ERROR("Cache directory was not set!"); + else { + boost::mutex::scoped_lock lock(m_cachedAvatarsMutex); ++#if BOOST_VERSION < 108500 + tmpRet = InternalReadDirectory(tmpCachePath.directory_string(), m_cachedAvatars); ++#else ++ tmpRet = InternalReadDirectory(tmpCachePath.string(), m_cachedAvatars); ++#endif + retVal = retVal && tmpRet; + } + +@@ -113,7 +129,11 @@ AvatarManager::AddSingleAvatar(const std::string &fileName) + { + bool retVal = false; + path filePath(fileName); ++#if BOOST_VERSION < 108500 + string tmpFileName(filePath.file_string()); ++#else ++ string tmpFileName(filePath.string()); ++#endif + + if (!fileName.empty() && !tmpFileName.empty()) { + unsigned outFileSize = 0; +@@ -240,7 +260,11 @@ AvatarManager::GetAvatarFileType(const string &fileName) + AvatarFileType fileType; + + path filePath(fileName); ++#if BOOST_VERSION < 108500 + string ext(extension(filePath)); ++#else ++ string ext(filePath.extension().string()); ++#endif + if (boost::algorithm::iequals(ext, ".png")) + fileType = AVATAR_FILE_TYPE_PNG; + else if (boost::algorithm::iequals(ext, ".jpg") || boost::algorithm::iequals(ext, ".jpeg")) +@@ -362,7 +386,11 @@ AvatarManager::StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFil + if (IsValidAvatarFileType(avatarFileType, data, size)) { + path tmpPath(cacheDir); + tmpPath /= (md5buf.ToString() + ext); ++#if BOOST_VERSION < 108500 + string fileName(tmpPath.file_string()); ++#else ++ string fileName(tmpPath.string()); ++#endif + std::ofstream o(fileName.c_str(), ios_base::out | ios_base::binary | ios_base::trunc); + if (!o.fail()) { + o.write((const char *)data, size); +@@ -426,7 +454,11 @@ AvatarManager::RemoveOldAvatarCacheEntries() + } + try { + path cachePath(cacheDir); ++#if BOOST_VERSION < 108500 + cacheDir = cachePath.directory_string(); ++#else ++ cacheDir = cachePath.string(); ++#endif + // Never delete anything if we do not have a special cache dir set. + if (!cacheDir.empty()) { + boost::mutex::scoped_lock lock(m_cachedAvatarsMutex); +@@ -441,12 +473,20 @@ AvatarManager::RemoveOldAvatarCacheEntries() + while (i != end) { + bool keepFile = false; + path filePath(i->second); ++#if BOOST_VERSION < 108500 + string fileString(filePath.file_string()); ++#else ++ string fileString(filePath.string()); ++#endif + // Only consider files which are definitely in the cache dir. + if (fileString.size() > cacheDir.size() && fileString.substr(0, cacheDir.size()) == cacheDir) { + // Only consider files with MD5 as file name. + MD5Buf tmpBuf; ++#if BOOST_VERSION < 108500 + if (exists(filePath) && tmpBuf.FromString(basename(filePath))) { ++#else ++ if (exists(filePath) && tmpBuf.FromString(filePath.stem().string())) { ++#endif + timeMap.insert(TimeAvatarMap::value_type(last_write_time(filePath), i->first)); + keepFile = true; + } +@@ -520,10 +560,19 @@ AvatarManager::InternalReadDirectory(const std::string &dir, AvatarMap &avatars) + directory_iterator end; + + while (i != end) { ++#if BOOST_VERSION < 108500 + if (is_regular(i->status())) { + string md5sum(basename(i->path())); ++#else ++ if (is_regular_file(i->status())) { ++ string md5sum(i->path().stem().string()); ++#endif + MD5Buf md5buf; ++#if BOOST_VERSION < 108500 + string fileName(i->path().file_string()); ++#else ++ string fileName(i->path().string()); ++#endif + if (md5buf.FromString(md5sum)) { + // Only consider files with md5sum as name. + avatars.insert(AvatarMap::value_type(md5buf, fileName)); +diff --git a/src/core/common/loghelper_server.cpp b/src/core/common/loghelper_server.cpp +index a0d0350ed..f3e8366b2 100644 +--- a/src/core/common/loghelper_server.cpp ++++ b/src/core/common/loghelper_server.cpp +@@ -59,7 +59,11 @@ loghelper_init(const string &logDir, int logLevel) + path tmpLogFile(logDir); + tmpLogFile /= SERVER_MSG_LOG_FILE_NAME; + ++#if BOOST_VERSION < 108500 + g_logFile = tmpLogFile.directory_string(); ++#else ++ g_logFile = tmpLogFile.string(); ++#endif + g_logLevel = logLevel; + } + +diff --git a/src/engine/log.cpp b/src/engine/log.cpp +index 1f50fde2e..c6fe7f8e1 100644 +--- a/src/engine/log.cpp ++++ b/src/engine/log.cpp +@@ -84,7 +84,11 @@ Log::init() + mySqliteLogFileName /= string("pokerth-log-") + curDateTime + ".pdb"; + + // open sqlite-db ++#if BOOST_VERSION < 108500 + sqlite3_open(mySqliteLogFileName.directory_string().c_str(), &mySqliteLogDb); ++#else ++ sqlite3_open(mySqliteLogFileName.string().c_str(), &mySqliteLogDb); ++#endif + if( mySqliteLogDb != 0 ) { + + int i; +diff --git a/src/engine/log.h b/src/engine/log.h +index 7dbf2514d..0a79c5377 100644 +--- a/src/engine/log.h ++++ b/src/engine/log.h +@@ -73,7 +73,11 @@ class Log + + std::string getMySqliteLogFileName() + { ++#if BOOST_VERSION < 108500 + return mySqliteLogFileName.directory_string(); ++#else ++ return mySqliteLogFileName.string(); ++#endif + } + + private: +diff --git a/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp b/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp +index 2acfeeb45..bdc625b4a 100644 +--- a/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp ++++ b/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp +@@ -65,7 +65,15 @@ std::string + NonQtHelper::getDataPathStdString(const char *argv0) + { + boost::filesystem::path startPath(argv0); ++#if BOOST_VERSION < 108500 + startPath = startPath.remove_leaf(); ++#else ++ startPath = startPath.remove_filename(); ++#endif + startPath /= "data"; ++#if BOOST_VERSION < 108500 + return stringToUtf8(startPath.directory_string()); ++#else ++ return stringToUtf8(startPath.string()); ++#endif + } +diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp +index d7fc7285a..9d35e99ff 100644 +--- a/src/net/common/clientstate.cpp ++++ b/src/net/common/clientstate.cpp +@@ -211,7 +211,11 @@ ClientStateStartServerListDownload::Enter(boost::shared_ptr client + } else { + // Download the server list. + boost::shared_ptr downloader(new DownloadHelper); ++#if BOOST_VERSION < 108500 + downloader->Init(client->GetContext().GetServerListUrl(), tmpServerListPath.directory_string()); ++#else ++ downloader->Init(client->GetContext().GetServerListUrl(), tmpServerListPath.string()); ++#endif + ClientStateDownloadingServerList::Instance().SetDownloadHelper(downloader); + client->SetState(ClientStateDownloadingServerList::Instance()); + } +@@ -303,13 +307,24 @@ ClientStateReadingServerList::Enter(boost::shared_ptr client) + path zippedServerListPath(context.GetCacheDir()); + zippedServerListPath /= context.GetServerListUrl().substr(context.GetServerListUrl().find_last_of('/') + 1); + path xmlServerListPath; ++#if BOOST_VERSION < 108500 + if (extension(zippedServerListPath) == ".z") { + xmlServerListPath = change_extension(zippedServerListPath, ""); ++#else ++ if (zippedServerListPath.extension().string() == ".z") { ++ xmlServerListPath = zippedServerListPath; ++ xmlServerListPath.replace_extension(""); ++#endif + + // Unzip the file using zlib. + try { ++#if BOOST_VERSION < 108500 + std::ifstream inFile(zippedServerListPath.directory_string().c_str(), ios_base::in | ios_base::binary); + std::ofstream outFile(xmlServerListPath.directory_string().c_str(), ios_base::out | ios_base::trunc); ++#else ++ std::ifstream inFile(zippedServerListPath.string().c_str(), ios_base::in | ios_base::binary); ++ std::ofstream outFile(xmlServerListPath.string().c_str(), ios_base::out | ios_base::trunc); ++#endif + boost::iostreams::filtering_streambuf in; + in.push(boost::iostreams::zlib_decompressor()); + in.push(inFile); +@@ -321,7 +336,11 @@ ClientStateReadingServerList::Enter(boost::shared_ptr client) + xmlServerListPath = zippedServerListPath; + + // Parse the server address. ++#if BOOST_VERSION < 108500 + TiXmlDocument doc(xmlServerListPath.directory_string()); ++#else ++ TiXmlDocument doc(xmlServerListPath.string()); ++#endif + + if (doc.LoadFile()) { + client->ClearServerInfoMap(); +diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp +index dee5daf68..e24413d14 100644 +--- a/src/net/common/clientthread.cpp ++++ b/src/net/common/clientthread.cpp +@@ -977,7 +977,11 @@ ClientThread::GetCacheServerListFileName() + size_t pos = serverListUrl.find_last_of('/'); + if (!GetContext().GetCacheDir().empty() && !serverListUrl.empty() && pos != string::npos && ++pos < serverListUrl.length()) { + tmpServerListPath /= serverListUrl.substr(pos); ++#if BOOST_VERSION < 108500 + fileName = tmpServerListPath.directory_string(); ++#else ++ fileName = tmpServerListPath.string(); ++#endif + } + return fileName; + } +diff --git a/src/net/common/downloaderthread.cpp b/src/net/common/downloaderthread.cpp +index 56a9526ec..7984cb410 100644 +--- a/src/net/common/downloaderthread.cpp ++++ b/src/net/common/downloaderthread.cpp +@@ -96,7 +96,11 @@ DownloaderThread::Main() + // Previous download was finished. + if (m_curDownloadData) { + path filepath(m_curDownloadData->filename); ++#if BOOST_VERSION < 108500 + std::ifstream instream(filepath.file_string().c_str(), ios_base::in | ios_base::binary); ++#else ++ std::ifstream instream(filepath.string().c_str(), ios_base::in | ios_base::binary); ++#endif + // Find out file size. + // Not fully portable, but works on win/linux/mac. + instream.seekg(0, ios_base::beg); +@@ -132,7 +136,11 @@ DownloaderThread::Main() + } + if (m_curDownloadData && !m_curDownloadData->filename.empty()) { + path filepath(m_curDownloadData->filename); ++#if BOOST_VERSION < 108500 + m_downloadHelper->Init(m_curDownloadData->address, filepath.file_string()); ++#else ++ m_downloadHelper->Init(m_curDownloadData->address, filepath.string()); ++#endif + m_downloadInProgress = true; + } + } +diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp +index 1cb341eaa..d3964895d 100644 +--- a/src/net/common/serverlobbythread.cpp ++++ b/src/net/common/serverlobbythread.cpp +@@ -277,7 +277,11 @@ ServerLobbyThread::Init(const string &logDir) + boost::filesystem::path logPath(logDir); + if (!logDir.empty()) { + logPath /= SERVER_STATISTICS_FILE_NAME; ++#if BOOST_VERSION < 108500 + m_statisticsFileName = logPath.directory_string(); ++#else ++ m_statisticsFileName = logPath.string(); ++#endif + ReadStatisticsFile(); + } + } +@@ -1264,7 +1268,11 @@ ServerLobbyThread::HandleNetPacketAvatarEnd(boost::shared_ptr sessi + // Init finished - start session. + EstablishSession(session); + LOG_MSG("Client \"" << session->GetClientAddr() << "\" uploaded avatar \"" ++#if BOOST_VERSION < 108500 + << boost::filesystem::path(avatarFileName).file_string() << "\"."); ++#else ++ << boost::filesystem::path(avatarFileName).string() << "\"."); ++#endif + } else + SessionError(session, ERR_NET_WRONG_AVATAR_SIZE); + } +diff --git a/src/net/common/uploaderthread.cpp b/src/net/common/uploaderthread.cpp +index f1eefea6c..ecf1436d9 100644 +--- a/src/net/common/uploaderthread.cpp ++++ b/src/net/common/uploaderthread.cpp +@@ -94,7 +94,11 @@ UploaderThread::Main() + url += filepath.filename().string(); + #endif + } ++#if BOOST_VERSION < 108500 + m_uploadHelper->Init(url, filepath.file_string(), data.user, data.pwd, data.filesize, data.httpPost); ++#else ++ m_uploadHelper->Init(url, filepath.string(), data.user, data.pwd, data.filesize, data.httpPost); ++#endif + m_uploadInProgress = true; + } + } +diff --git a/src/pokerth_server.cpp b/src/pokerth_server.cpp +index 450a47e9d..1ee0db80e 100644 +--- a/src/pokerth_server.cpp ++++ b/src/pokerth_server.cpp +@@ -158,7 +158,11 @@ main(int argc, char *argv[]) + if (pidFile.empty()) { + path tmpPidPath(myConfig->readConfigString("LogDir")); + tmpPidPath /= "pokerth.pid"; ++#if BOOST_VERSION < 108500 + pidFile = tmpPidPath.directory_string(); ++#else ++ pidFile = tmpPidPath.string(); ++#endif + } + { + std::ofstream pidStream(pidFile.c_str(), ios_base::out | ios_base::trunc); diff --git a/games/pokerth/pokerth.SlackBuild b/games/pokerth/pokerth.SlackBuild index 338635b1156..456fff3fc50 100644 --- a/games/pokerth/pokerth.SlackBuild +++ b/games/pokerth/pokerth.SlackBuild @@ -88,6 +88,7 @@ find -L . \ patch -p1 < $CWD/patches/pokerth-1.1.2-boost-1.70-websocket-fix2.patch ) patch -p1 < $CWD/patches/pokerth-1.1.2-newer-protobuf.patch +patch -p1 < $CWD/patches/pokerth-1.1.2-boost-1.85.patch qmake-qt5 QMAKE_CFLAGS_ISYSTEM= -spec linux-g++ pokerth.pro make diff --git a/games/ppsspp/ppsspp.SlackBuild b/games/ppsspp/ppsspp.SlackBuild index 9cd4b170533..7723b9a9790 100644 --- a/games/ppsspp/ppsspp.SlackBuild +++ b/games/ppsspp/ppsspp.SlackBuild @@ -87,6 +87,10 @@ sed -i -e '/include(ccache)/d' CMakeLists.txt # set git-version sed -i "s/unknown/${VERSION}/" git-version.cmake +# Build the internal ffmpeg (it's the only one supported by upstream) +( cd ffmpeg + ./linux_x86-64.sh ) + if [ "${QT:-OFF}" = "ON" ]; then cmake -B build-qt \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ @@ -95,7 +99,6 @@ if [ "${QT:-OFF}" = "ON" ]; then -DCMAKE_SKIP_RPATH=TRUE \ -DUSING_QT_UI=ON \ -DUSE_SYSTEM_LIBZIP=ON \ - -DUSE_SYSTEM_FFMPEG=ON \ -DUSE_DISCORD=OFF \ -DUSE_SYSTEM_ZSTD=ON \ -DCMAKE_BUILD_TYPE=Release @@ -111,7 +114,6 @@ cmake -B build-sdl \ -DCMAKE_SKIP_RPATH=TRUE \ -DUSING_QT_UI=OFF \ -DUSE_SYSTEM_LIBZIP=ON \ - -DUSE_SYSTEM_FFMPEG=ON \ -DUSE_DISCORD=OFF \ -DUSE_SYSTEM_ZSTD=ON \ -DCMAKE_BUILD_TYPE=Release diff --git a/games/scummvm/0001-ICB-compile-fix-for-GCC-14.patch b/games/scummvm/0001-ICB-compile-fix-for-GCC-14.patch new file mode 100644 index 00000000000..774b83feabd --- /dev/null +++ b/games/scummvm/0001-ICB-compile-fix-for-GCC-14.patch @@ -0,0 +1,42 @@ +From a04bb51bf5984896ba1b9c9fadef0b1f7ae73f8b Mon Sep 17 00:00:00 2001 +From: Christian Krause +Date: Tue, 6 Feb 2024 23:54:44 +0100 +Subject: [PATCH] ICB: compile fix for GCC 14 + +- cast const away to allow modification (as intended according to + existing comments) +--- + engines/icb/common/px_array.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/engines/icb/common/px_array.h b/engines/icb/common/px_array.h +index 5ee18b37fa3..c52f375d1b1 100644 +--- a/engines/icb/common/px_array.h ++++ b/engines/icb/common/px_array.h +@@ -100,9 +100,9 @@ const Type &T_MYACTARRAY::operator[](uint32 n) const { + // It is permissable to look at an element that has not been defined, as the constructor assures + // that the contents are valid + if (n >= m_userPosition) { +- // We must cast this to a type that can change +- ((const rcActArray *)this)->ResizeArray(n); +- ((const rcActArray *)this)->m_userPosition = n + 1; ++ // Remove any 'constness' for a resize ++ (const_cast *>(this))->ResizeArray(n); ++ (const_cast *>(this))->m_userPosition = n + 1; + } + + return (*(m_contents[n])); +@@ -304,8 +304,8 @@ template const Type rcIntArray::operator[](uint32 index) cons + // It is permissable to look at an element that has not been defined, as it will have been set to 0 + if (index >= m_userPosition) { + // Remove any 'constness' for a resize +- ((const rcIntArray *)this)->ResizeArray(index); +- ((const rcIntArray *)this)->m_userPosition = index + 1; ++ (const_cast *>(this))->ResizeArray(index); ++ (const_cast *>(this))->m_userPosition = index + 1; + } + + return m_contents[index]; +-- +2.44.0 + diff --git a/games/scummvm/scummvm.SlackBuild b/games/scummvm/scummvm.SlackBuild index 00a21a1f7b1..4fd3d03e796 100644 --- a/games/scummvm/scummvm.SlackBuild +++ b/games/scummvm/scummvm.SlackBuild @@ -86,11 +86,13 @@ 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/0001-ICB-compile-fix-for-GCC-14.patch + # avoid linking breakage on i?86 if [[ $ARCH == i?86 ]]; then linker=bfd; else linker=gold; fi CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -fpermissive -Wno-template-id-cdtor" \ LDFLAGS="-fuse-ld=$linker" \ ./configure \ --prefix=/usr \ diff --git a/games/supertux/gcc12.patch b/games/supertux/gcc12.patch new file mode 100644 index 00000000000..f5e7392c3c7 --- /dev/null +++ b/games/supertux/gcc12.patch @@ -0,0 +1,11 @@ +diff -upr SuperTux-v0.6.3-Source.orig/external/partio_zip/zip_manager.cpp SuperTux-v0.6.3-Source/external/partio_zip/zip_manager.cpp +--- SuperTux-v0.6.3-Source.orig/external/partio_zip/zip_manager.cpp 2021-12-23 01:01:58.000000000 +0200 ++++ SuperTux-v0.6.3-Source/external/partio_zip/zip_manager.cpp 2022-06-13 15:20:45.305976668 +0300 +@@ -47,6 +47,7 @@ extern "C"{ + #include + #include + #include ++#include + + #include "zip_manager.hpp" + diff --git a/games/supertux/missing-include-for-FLT_EPSILON.patch b/games/supertux/missing-include-for-FLT_EPSILON.patch new file mode 100644 index 00000000000..44bc370a74b --- /dev/null +++ b/games/supertux/missing-include-for-FLT_EPSILON.patch @@ -0,0 +1,13 @@ +diff --git a/src/supertux/game_session.cpp b/src/supertux/game_session.cpp +index 41de52e..a8ebfc9 100644 +--- a/src/supertux/game_session.cpp ++++ b/src/supertux/game_session.cpp +@@ -14,6 +14,8 @@ + // You should have received a copy of the GNU General Public License + // along with this program. If not, see . + ++#include ++ + #include "supertux/game_session.hpp" + + #include "audio/sound_manager.hpp" diff --git a/games/supertux/supertux.SlackBuild b/games/supertux/supertux.SlackBuild index a492e216aa2..26795a4bbd6 100644 --- a/games/supertux/supertux.SlackBuild +++ b/games/supertux/supertux.SlackBuild @@ -84,6 +84,9 @@ 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/gcc12.patch +patch -p1 < $CWD/missing-include-for-FLT_EPSILON.patch + mkdir -p build cd build cmake \ diff --git a/games/tome/aur-tome4.patch b/games/tome/aur-tome4.patch new file mode 100644 index 00000000000..7c24269af30 --- /dev/null +++ b/games/tome/aur-tome4.patch @@ -0,0 +1,457 @@ +diff -Naur orig/build/runner.lua new/build/runner.lua +--- orig/build/runner.lua 2014-05-19 10:42:12.000000000 +0200 ++++ new/build/runner.lua 2020-10-30 23:01:51.861023690 +0100 +@@ -24,28 +24,28 @@ + files { "../src/runner/main.c", "../src/getself.c" } + links { "m" } + +- configuration "linux" ++ filter "system:linux" + links { "dl", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "GL", "GLU", "m", "pthread" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_LINUX' } + +- configuration "bsd" ++ filter "system:bsd" + links { "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "GL", "GLU", "m", "pthread" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_BSD' } + +- configuration "windows" ++ filter "system:windows" + links { "mingw32", "SDLmain", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "OPENGL32", "GLU32", "wsock32" } +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } + prebuildcommands { "windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" } + linkoptions { "../src/windows/icon.res" } + +- configuration "macosx" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } ++ filter "system:macosx" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } + linkoptions { "-framework SDL", "-framework SDL_image", "-framework SDL_ttf", "-framework SDL_mixer", "-framework Cocoa", "-framework OpenGL" } + links { "IOKit" } + +- configuration {"Debug"} ++ filter {"Debug"} + postbuildcommands { "cp ../bin/Debug/t-engine ../t-engine", } +- configuration {"Release"} ++ filter {"Release"} + postbuildcommands { "cp ../bin/Release/t-engine ../t-engine", } + + project "te4runner" +@@ -58,19 +58,19 @@ + files { "../src/runner/runner.c", "../src/physfs.c", "../src/auxiliar.c" } + links { "runner-physfs", "runner-lua", "m" } + +- configuration "linux" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' } +- configuration "bsd" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } +- +- configuration "windows" +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } +- configuration "macosx" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } ++ filter "system:linux" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_LINUX' } ++ filter "system:bsd" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_BSD' } ++ ++ filter "system:windows" ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } ++ filter "system:macosx" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } + +- configuration {"Debug"} ++ filter {"Debug"} + postbuildcommands { "cp ../bin/Debug/te4runner.tec ../", } +- configuration {"Release"} ++ filter {"Release"} + postbuildcommands { "cp ../bin/Release/te4runner.tec ../", } + + project "runner-physfs" +@@ -83,13 +83,13 @@ + + files { "../src/physfs/*.c", "../src/zlib/*.c", "../src/physfs/archivers/*.c", } + +- configuration "linux" ++ filter "system:linux" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "bsd" ++ filter "system:bsd" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "windows" ++ filter "system:windows" + files { "../src/physfs/platform/windows.c", } +- configuration "macosx" ++ filter "system:macosx" + files { "../src/physfs/platform/macosx.c", "../src/physfs/platform/posix.c", } + includedirs { "/Library/Frameworks/SDL.framework/Headers" } + +diff -Naur orig/build/te4core.lua new/build/te4core.lua +--- orig/build/te4core.lua 2019-10-03 15:35:43.000000000 +0200 ++++ new/build/te4core.lua 2020-10-30 23:05:15.066698600 +0100 +@@ -40,11 +40,11 @@ + links { "physfs", "lua".._OPTIONS.lua, "fov", "luasocket", "luaprofiler", "lpeg", "tcodimport", "lxp", "expatstatic", "luamd5", "luazlib", "luabitop", "te4-bzip", "te4-wfc", "utf8proc" } + if _OPTIONS.discord then defines { "DISCORD_TE4" } end + defines { "_DEFAULT_VIDEOMODE_FLAGS_='SDL_HWSURFACE|SDL_DOUBLEBUF'" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], "TE4CORE_VERSION="..TE4CORE_VERSION } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], "TE4CORE_VERSION="..TE4CORE_VERSION } + buildoptions { "-O3" } + +- if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib "} end +- if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib64 "} end ++ if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib "} end ++ if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib64 "} end + + if _OPTIONS.relpath == "32" then defines{"TE4_RELPATH32"} end + if _OPTIONS.relpath == "64" then defines{"TE4_RELPATH64"} end +@@ -63,7 +63,7 @@ + prelinkcommands { "i686-pc-mingw32-ranlib ../bin/Debug/*.a" } + end + +- configuration "macosx" ++ filter "system:macosx" + files { "../src/mac/SDL*" } + includedirs { + "/System/Library/Frameworks/OpenGL.framework/Headers", +@@ -84,7 +84,7 @@ + "/usr/local/include", + "/usr/local/opt/libpng12/include", + } +- defines { "USE_TENGINE_MAIN", 'SELFEXE_MACOSX', [[TENGINE_HOME_PATH='"/Library/Application Support/T-Engine/"']] } ++ defines { "USE_TENGINE_MAIN", 'SELFEXE_MACOSX', [[TENGINE_HOME_PATH="/Library/Application Support/T-Engine/"]] } + linkoptions { + "-framework Cocoa", + "-framework OpenGL", +@@ -108,9 +108,9 @@ + targetdir "." + links { "IOKit" } + +- configuration "windows" ++ filter "system:windows" + links { "mingw32", "SDL2main", "SDL2", "SDL2_ttf", "SDL2_image", "OpenAL32", "vorbisfile", "opengl32", "glu32", "wsock32", "png" } +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } + if _OPTIONS.wincross then + prebuildcommands { "i686-pc-mingw32-windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" } + else +@@ -118,33 +118,33 @@ + end + linkoptions { "../src/windows/icon.res" } + linkoptions { "-mwindows" } +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } + +- configuration "linux" ++ filter "system:linux" + libdirs {"/opt/SDL-2.0/lib/"} + links { "dl", "SDL2", "SDL2_ttf", "SDL2_image", "png", "openal", "vorbisfile", "GL", "GLU", "m", "pthread" } + linkoptions { "-Wl,-E" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_LINUX' } + if steamlin64 then steamlin64() end + +- configuration "bsd" ++ filter "system:bsd" + libdirs {"/usr/local/lib/"} + links { "SDL2", "SDL2_ttf", "SDL2_image", "png", "openal", "vorbisfile", "GL", "GLU", "m", "pthread" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_BSD' } + +- configuration {"Debug"} ++ filter {"Debug"} + if _OPTIONS.wincross then + postbuildcommands { "cp ../bin/Debug/t-engine.exe ../", } + else +- if os.get() ~= "macosx" then postbuildcommands { "cp ../bin/Debug/t-engine ../", } ++ if os.target() ~= "macosx" then postbuildcommands { "cp ../bin/Debug/t-engine ../", } + else postbuildcommands { "cp ../build/t-engine.app/Contents/MacOS/t-engine ../mac/base_app/Contents/MacOS", } + end + end +- configuration {"Release"} ++ filter {"Release"} + if _OPTIONS.wincross then + postbuildcommands { "cp ../bin/Release/t-engine.exe ../", } + else +- if os.get() ~= "macosx" then postbuildcommands { "cp ../bin/Release/t-engine ../", } ++ if os.target() ~= "macosx" then postbuildcommands { "cp ../bin/Release/t-engine ../", } + else postbuildcommands { "cp ../build/t-engine.app/Contents/MacOS/t-engine ../mac/base_app/Contents/MacOS", } + end + end +@@ -165,13 +165,13 @@ + + files { "../src/physfs/*.c", "../src/zlib/*.c", "../src/physfs/archivers/*.c", } + +- configuration "linux" ++ filter "system:linux" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "bsd" ++ filter "system:bsd" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "windows" ++ filter "system:windows" + files { "../src/physfs/platform/windows.c", } +- configuration "macosx" ++ filter "system:macosx" + files { "../src/physfs/platform/macosx.c", "../src/physfs/platform/posix.c", } + includedirs { "/Library/Frameworks/SDL2.framework/Headers" } + +@@ -230,7 +230,7 @@ + defines { "LJ_ABI_SOFTFP=0" } + end + +- configuration {"Debug"} ++ filter {"Debug"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"', +@@ -238,7 +238,7 @@ + } + end + postbuildcommands { "cp ../bin/Debug/minilua ../src/luajit2/src/host/", } +- configuration {"Release"} ++ filter {"Release"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"', +@@ -332,7 +332,7 @@ + + files { "../src/luajit2/src/host/buildvm*.c" } + +- configuration {"Debug"} ++ filter {"Debug"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_lib.cross.o" -c "../src/luajit2/src/host/buildvm_lib.c"', +@@ -344,7 +344,7 @@ + } + end + postbuildcommands { "cp ../bin/Debug/buildvm ../src/luajit2/src/", } +- configuration {"Release"} ++ filter {"Release"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_lib.cross.o" -c "../src/luajit2/src/host/buildvm_lib.c"', +@@ -367,7 +367,7 @@ + files { "../src/luajit2/src/*.c", "../src/luajit2/src/*.s", "../src/luajit2/src/lj_vm.s", "../src/luajit2/src/lj_bcdef.h", "../src/luajit2/src/lj_ffdef.h", "../src/luajit2/src/lj_ffdef.h", "../src/luajit2/src/lj_libdef.h", "../src/luajit2/src/lj_recdef.h", "../src/luajit2/src/lj_folddef.h" } + excludes { "../src/luajit2/src/buildvm*.c", "../src/luajit2/src/luajit.c", "../src/luajit2/src/ljamalg.c" } + +- configuration "linux" ++ filter "system:linux" + if not _OPTIONS["no-cleanup-jit2"] then + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ +@@ -381,7 +381,7 @@ + } + end + +- configuration "bsd" ++ filter "system:bsd" + if not _OPTIONS["no-cleanup-jit2"] then + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ +@@ -395,7 +395,7 @@ + } + end + +- configuration "macosx" ++ filter "system:macosx" + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ + "../src/luajit2/src/buildvm -m machasm -o ../src/luajit2/src/lj_vm.s", +@@ -407,7 +407,7 @@ + "../src/luajit2/src/buildvm -m folddef -o ../src/luajit2/src/lj_folddef.h ../src/luajit2/src/lj_opt_fold.c", + } + +- configuration "windows" ++ filter "system:windows" + if not _OPTIONS["no-cleanup-jit2"] then + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ +@@ -429,7 +429,7 @@ + targetname "luasocket" + buildoptions { "-O2" } + +- configuration "not windows" ++ filter "system:not windows" + files { + "../src/luasocket/auxiliar.c", + "../src/luasocket/buffer.c", +@@ -445,7 +445,7 @@ + "../src/luasocket/usocket.c", + "../src/luasocket/mime.c", + } +- configuration "windows" ++ filter "system:windows" + files { + "../src/luasocket/auxiliar.c", + "../src/luasocket/buffer.c", +@@ -583,21 +583,21 @@ + buildoptions { "-O3", "-std=c++11" } + cppconfig("web") + +- if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN "} end +- if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN "} end ++ if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN "} end ++ if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN "} end + + files { "../src/web-cef3/*.cpp", } + +- configuration "macosx" ++ filter "system:macosx" + defines { 'SELFEXE_MACOSX' } + libdirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/xcodebuild/Release/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/Release/"} + includedirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/include/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/"} + links { "cef", "cef_dll_wrapper" } + +- configuration "windows" ++ filter "system:windows" + defines { 'SELFEXE_WINDOWS' } + +- configuration "linux" ++ filter "system:linux" + buildoptions{"-Wall -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm"} + libdirs {"/opt/cef3/1547/out/Release/obj.target/", "/opt/cef3/1547/Release/"} + includedirs {"/opt/cef3/1547/include/", "/opt/cef3/1547/"} +@@ -619,19 +619,19 @@ + "../src/web-cef3/spawn.cpp", + } + +- configuration "macosx" ++ filter "system:macosx" + defines { 'SELFEXE_MACOSX' } + libdirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/xcodebuild/Release/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/Release/"} + includedirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/include/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/"} + links { "cef", "cef_dll_wrapper" } + +- configuration "linux" ++ filter "system:linux" + buildoptions{"-Wall -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm"} + libdirs {"/opt/cef3/1547/out/Release/obj.target/", "/opt/cef3/1547/Release/"} + includedirs {"/opt/cef3/1547/include/", "/opt/cef3/1547/"} + links { "cef", "cef_dll_wrapper" } +- if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib "} end +- if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib64 "} end ++ if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib "} end ++ if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib64 "} end + defines { 'SELFEXE_LINUX' } + end + +@@ -641,7 +641,7 @@ + + if _OPTIONS.discord and not _OPTIONS['discord-nolib'] then + project "te4-discord" +- configuration "linux" ++ filter "system:linux" + kind "SharedLib" + language "C++" + targetname "discord-rpc" +@@ -654,11 +654,11 @@ + files { "../src/discord-rpc/src/discord-rpc.cpp", "../src/discord-rpc/src/rpc_connection.cpp", "../src/discord-rpc/src/serialization.cpp", } + files { "../src/discord-rpc/src/connection_unix.cpp", "../src/discord-rpc/src/discord_register_linux.cpp", } + +- configuration "windows" ++ filter "system:windows" + kind "SharedLib" + -- Empty + +- configuration "macosx" ++ filter "system:macosx" + kind "SharedLib" + -- Empty + end +diff -Naur orig/premake5.lua new/premake5.lua +--- orig/premake5.lua 2019-09-13 11:46:14.000000000 +0200 ++++ new/premake5.lua 2020-10-30 23:04:41.500196031 +0100 +@@ -1,6 +1,6 @@ + dofile("build/options.lua") + +-solution "TEngine" ++workspace "TEngine" + configurations { "Debug", "Release" } + objdir "obj" + defines {"GLEW_STATIC"} +@@ -30,7 +30,7 @@ + } + else + includedirs { +- "/opt/SDL-2.0/include/SDL2", ++ "/usr/include/SDL2", + "/usr/include/GL", + } + end +@@ -42,7 +42,7 @@ + dofile("steamworks/build/steam-def.lua") + end + +-configuration "bsd" ++filter "system:bsd" + libdirs { + "/usr/local/lib", + } +@@ -51,7 +51,7 @@ + } + + if _OPTIONS.wincross then +-configuration "windows" ++filter "system:windows" + libdirs { + "/Test/xcompile/local//lib", + } +@@ -60,7 +60,7 @@ + "/Test/xcompile/local/include", + } + else +-configuration "windows" ++filter "system:windows" + libdirs { + "/c/code/SDL/lib", + } +@@ -72,7 +72,7 @@ + end + + cppconfig = function(what) +- if os.get() == "macosx" then ++ if os.target() == "macosx" then + if what == "web" then + buildoptions { "-stdlib=libstdc++" } + linkoptions { "-stdlib=libstdc++" } +@@ -84,9 +84,8 @@ + -- links { "stdc++" } + end + +-configuration "macosx" +- premake.gcc.cc = 'clang' +- premake.gcc.cxx = 'clang++' ++filter "system:macosx" ++ toolset("clang") + + buildoptions { "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk", "-mmacosx-version-min=10.7" } + includedirs { +@@ -95,9 +94,9 @@ + "/Library/Frameworks/SDL2_ttf.framework/Headers", + } + +-configuration "Debug" ++filter "Debug" + defines { } +- flags { "Symbols" } ++ symbols "On" + buildoptions { "-ggdb" } + -- buildoptions { "-O3" } + targetdir "bin/Debug" +@@ -105,9 +104,10 @@ + if _OPTIONS.pedantic then buildoptions { "-Wall" } end + defines {"TE4_LUA_ALLOW_GENERIC_IO"} + +-configuration "Release" ++filter "Release" + defines { "NDEBUG=1" } +- flags { "Optimize", "NoFramePointer" } ++ optimize "On" ++ omitframepointer "On" + buildoptions { "-O2" } + targetdir "bin/Release" + diff --git a/games/tome/tome.SlackBuild b/games/tome/tome.SlackBuild index d37a7f5d972..5099533969f 100644 --- a/games/tome/tome.SlackBuild +++ b/games/tome/tome.SlackBuild @@ -86,15 +86,15 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -# correction of SDL2 headers directory -sed -i "s/opt\/SDL-2.0/usr/" premake4.lua +cp premake4.lua premake5.lua +patch -p1 < $CWD/aur-tome4.patch # build game # 20241018 bkw: added -j1 to make. Without it, the build was failing # about 50% of the time. With it, it built successfully 10 times in # a row. -premake4 gmake -env -u ARCH make -j1 +premake5 gmake +env -u ARCH CFLAGS="$SLKCFLAGS -fpermissive" make -j1 # copy the data game mkdir -p $PKG/usr/share/games/$PRGNAM $PKG/usr/bin diff --git a/games/tome/tome.info b/games/tome/tome.info index 0c38f5245c5..506961c8cfa 100644 --- a/games/tome/tome.info +++ b/games/tome/tome.info @@ -5,6 +5,6 @@ DOWNLOAD="https://te4.org/dl/t-engine/t-engine4-src-1.7.6.tar.bz2" MD5SUM="31e78cd88b383a3a8667e2fd90abfd2b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="premake" +REQUIRES="premake5" MAINTAINER="Dimitris Zlatanidis" EMAIL="dslackw@gmail.com" diff --git a/games/warzone2100/warzone2100.SlackBuild b/games/warzone2100/warzone2100.SlackBuild index 4696d907907..eac2ad30d1b 100644 --- a/games/warzone2100/warzone2100.SlackBuild +++ b/games/warzone2100/warzone2100.SlackBuild @@ -101,6 +101,7 @@ cd build -DCMAKE_INSTALL_MANDIR=/usr/man \ -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ -DCMAKE_INSTALL_BINDIR=games \ + -DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF \ .. DESTDIR=$PKG cmake --build . --target install cd .. diff --git a/gis/opencpn/README b/gis/opencpn/README deleted file mode 100644 index 7b1dd96ad5a..00000000000 --- a/gis/opencpn/README +++ /dev/null @@ -1,8 +0,0 @@ -OpenCPN is a free software (GPLv2) project to create a concise chart -plotter and navigation software, for use underway or as a planning -tool. OpenCPN is developed by a team of active sailors using real -world conditions for program testing and refinement. - -If you are upgrading or installing new, OpenCPN 5.2.x needs wxGTK3 -to be built with webkit support. So you will have to install -webkit2gtk, available here at SBo, then build and install wxGTK3. diff --git a/gis/opencpn/doinst.sh b/gis/opencpn/doinst.sh deleted file mode 100644 index 3d2e9538d10..00000000000 --- a/gis/opencpn/doinst.sh +++ /dev/null @@ -1,10 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi diff --git a/gis/opencpn/opencpn.SlackBuild b/gis/opencpn/opencpn.SlackBuild deleted file mode 100644 index 0204b254d91..00000000000 --- a/gis/opencpn/opencpn.SlackBuild +++ /dev/null @@ -1,137 +0,0 @@ -#!/bin/bash - -# Slackware build script for opencpn - -# Copyright 2021 Matt Dinslage, Springfield, MO -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=opencpn -VERSION=${VERSION:-5.2.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/OpenCPN-$VERSION.tar.gz -cd OpenCPN-$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 {} \; - -# Fix LIBDIR -if [ "$ARCH" = "x86_64" ]; then - sed -i '0,/"i386"/{s/"i386"/"x86_64"/}' cmake/GetArch.cmake - sed -i '0,/"lib"/{s/"lib"/"lib64"/}' cmake/GetArch.cmake -fi - -# Fix MANDIR -sed -i 's,${PREFIX_DATA}/man/man1,/usr/man/man1,g' CMakeLists.txt - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DOPCPN_FORCE_GTK3=ON \ - -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config \ - -DBUNDLE_GSHHS=CRUDE \ - -DBUNDLE_TCDATA=ON \ - -DBUNDLE_DOCS=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -cd .. - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -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 - -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 INSTALL README data/doc/help_en_US.html data/license.txt $PKG/usr/doc/$PRGNAM-$VERSION -mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION -rm -rf $PKG/usr/share/doc -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -rm -r $PKG/usr/share/icons/hicolor/* -mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps -cp $TMP/OpenCPN-$VERSION/src/bitmaps/other_svg_src/opencpn_logo.svg \ - $PKG/usr/share/icons/hicolor/scalable/apps/opencpn.svg - -mkdir -p $PKG/usr/share/pixmaps -convert $PKG/usr/share/icons/hicolor/scalable/apps/opencpn.svg -resize 256x256 \ - $PKG/usr/share/pixmaps/opencpn.png - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/gis/opencpn/opencpn.info b/gis/opencpn/opencpn.info deleted file mode 100644 index a44554b6bb8..00000000000 --- a/gis/opencpn/opencpn.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="opencpn" -VERSION="5.2.4" -HOMEPAGE="https://opencpn.org/" -DOWNLOAD="https://github.com/OpenCPN/OpenCPN/archive/v5.2.4/OpenCPN-5.2.4.tar.gz" -MD5SUM="9ca81bed7bca1706ecaac98a7578d6bb" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="gpsd tinyxml libmspack portaudio lsb-release webkit2gtk wxGTK3" -MAINTAINER="M.Dinslage" -EMAIL="daedra1980@gmail.com" diff --git a/gis/opencpn/slack-desc b/gis/opencpn/slack-desc deleted file mode 100644 index db7e4e4e3dd..00000000000 --- a/gis/opencpn/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------------------------------------------------------| -opencpn: opencpn (A Chartplotter and GPS Navigation Software) -opencpn: -opencpn: OpenCPN is a free software (GPLv2) project to create a concise chart -opencpn: plotter and navigation software, for use underway or as a planning -opencpn: tool. OpenCPN is developed by a team of active sailors using real -opencpn: world conditions for program testing and refinement. -opencpn: -opencpn: -opencpn: -opencpn: -opencpn: diff --git a/gis/python3-netcdf4-python/python3-netcdf4-python.SlackBuild b/gis/python3-netcdf4-python/python3-netcdf4-python.SlackBuild index 1e9dffc2247..8f8b6ad4179 100644 --- a/gis/python3-netcdf4-python/python3-netcdf4-python.SlackBuild +++ b/gis/python3-netcdf4-python/python3-netcdf4-python.SlackBuild @@ -74,6 +74,8 @@ sed -i 's/oldest-supported-numpy/numpy>=1.19.3/' pyproject.toml PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') export PYTHONPATH=/opt/python$PYVER/site-packages +export CFLAGS="-fpermissive" + python3 -m build --no-isolation python3 -m installer -d "$PKG" dist/*.whl diff --git a/graphics/darktable/darktable.SlackBuild b/graphics/darktable/darktable.SlackBuild index 1cc78382f43..d6fcb763e1c 100644 --- a/graphics/darktable/darktable.SlackBuild +++ b/graphics/darktable/darktable.SlackBuild @@ -29,8 +29,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=darktable -VERSION=${VERSION:-4.2.1} -BUILD=${BUILD:-3} +VERSION=${VERSION:-4.8.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} # Slackware's lensfun isn't compatible @@ -46,9 +46,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -100,9 +97,6 @@ cd build -DDONT_USE_INTERNAL_LUA=Off \ -DUSE_LIBSECRET=On \ -DBINARY_PACKAGE_BUILD=1 \ - -DLensFun_INCLUDE_DIR="/opt/$LENSFUN/include/lensfun" \ - -DLensFun_LIBRARIES="/opt/$LENSFUN/lib$LIBDIRSUFFIX" \ - -DLensFun_LIBRARY="/opt/$LENSFUN/lib$LIBDIRSUFFIX/liblensfun.so" \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/graphics/darktable/darktable.info b/graphics/darktable/darktable.info index d7904b3b6b2..47abf7572b9 100644 --- a/graphics/darktable/darktable.info +++ b/graphics/darktable/darktable.info @@ -1,10 +1,10 @@ PRGNAM="darktable" -VERSION="4.2.1" +VERSION="4.8.1" HOMEPAGE="https://www.darktable.org/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/darktable-org/darktable/releases/download/release-4.2.1/darktable-4.2.1.tar.xz" -MD5SUM_x86_64="ac7b028c0768f19ce9cb604beaac3d86" -REQUIRES="gmic pugixml lensfun03" +DOWNLOAD_x86_64="https://github.com/darktable-org/darktable/releases/download/release-4.8.1/darktable-4.8.1.tar.xz" +MD5SUM_x86_64="34ff16b7a086734a20a86949cf358a4a" +REQUIRES="gmic pugixml" MAINTAINER="K. Eugene Carlson" EMAIL="kvngncrlsn@gmail.com" diff --git a/graphics/dia/dia.SlackBuild b/graphics/dia/dia.SlackBuild index 0210679254c..6b65ec05149 100644 --- a/graphics/dia/dia.SlackBuild +++ b/graphics/dia/dia.SlackBuild @@ -19,7 +19,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dia VERSION=${VERSION:-0.97.3} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -31,9 +31,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -64,7 +61,6 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.xz - cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -73,9 +69,12 @@ 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 {} \; -# Enable HTML documentation, necessary for Help functionality. -patch configure.in < $CWD/dia-enable-html-docs.patch +# Upstream bug #737254 +sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die +# Upstream bug #737255 +sed -i -e "/localedir/d" configure.in || die +for i in $CWD/patches/* ; do patch -p1 < $i ; done autoreconf -fi CFLAGS="$SLKCFLAGS" \ @@ -85,10 +84,12 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-swig \ --with-cairo \ - --with-python \ + --without-python \ + --without-swig \ + --without-hardbooks \ --disable-gnome \ + --disable-libemf \ --disable-static \ --build=$ARCH-slackware-linux diff --git a/graphics/dia/patches/dia-0.97.3-c99.patch b/graphics/dia/patches/dia-0.97.3-c99.patch new file mode 100644 index 00000000000..6ee2cb2df32 --- /dev/null +++ b/graphics/dia/patches/dia-0.97.3-c99.patch @@ -0,0 +1,284 @@ +https://bugs.gentoo.org/883069 +https://src.fedoraproject.org/rpms/dia/raw/rawhide/f/dia-0.97.3-const-ft_vector.patch +https://src.fedoraproject.org/rpms/dia/blob/rawhide/f/dia-0.97.3-g_test_add_data_func_1.patch +https://src.fedoraproject.org/rpms/dia/blob/rawhide/f/dia-0.97.3-g_test_add_data_func_2.patch +https://src.fedoraproject.org/rpms/dia/blob/rawhide/f/dia-0.97.3-get_data_size.patch + +From e5557aa1d396bc3ca80240f7b5c0a1831a5cf209 Mon Sep 17 00:00:00 2001 +From: Hans Breuer +Date: Sat, 4 May 2013 15:20:15 +0200 +Subject: [PATCH] [warningectomy] initialization from incompatible pointer type + +FT_Outline_Funcs take const FT_Vector* nowadays. +--- a/plug-ins/postscript/diapsft2renderer.c ++++ b/plug-ins/postscript/diapsft2renderer.c +@@ -61,16 +61,16 @@ void draw_bezier_outline(DiaPsRenderer *renderer, + double pos_y + ); + /* Countour traveling functions */ +-static int paps_move_to( FT_Vector* to, ++static int paps_move_to( const FT_Vector* to, + void *user_data); +-static int paps_line_to( FT_Vector* to, ++static int paps_line_to( const FT_Vector* to, + void *user_data); +-static int paps_conic_to( FT_Vector* control, +- FT_Vector* to, ++static int paps_conic_to( const FT_Vector* control, ++ const FT_Vector* to, + void *user_data); +-static int paps_cubic_to( FT_Vector* control1, +- FT_Vector* control2, +- FT_Vector* to, ++static int paps_cubic_to( const FT_Vector* control1, ++ const FT_Vector* control2, ++ const FT_Vector* to, + void *user_data); + + static void dia_ps_ft2_renderer_class_init (DiaPsFt2RendererClass *klass); +@@ -111,7 +111,7 @@ set_font(DiaRenderer *self, DiaFont *font, real height) + /*====================================================================== + outline traversing functions. + ----------------------------------------------------------------------*/ +-static int paps_move_to( FT_Vector* to, ++static int paps_move_to( const FT_Vector* to, + void *user_data) + { + OutlineInfo *outline_info = (OutlineInfo*)user_data; +@@ -121,7 +121,7 @@ static int paps_move_to( FT_Vector* to, + return 0; + } + +-static int paps_line_to( FT_Vector* to, ++static int paps_line_to( const FT_Vector* to, + void *user_data) + { + OutlineInfo *outline_info = (OutlineInfo*)user_data; +@@ -131,8 +131,8 @@ static int paps_line_to( FT_Vector* to, + return 0; + } + +-static int paps_conic_to( FT_Vector* control, +- FT_Vector* to, ++static int paps_conic_to( const FT_Vector* control, ++ const FT_Vector* to, + void *user_data) + { + OutlineInfo *outline_info = (OutlineInfo*)user_data; +@@ -144,9 +144,9 @@ static int paps_conic_to( FT_Vector* control, + return 0; + } + +-static int paps_cubic_to( FT_Vector* control1, +- FT_Vector* control2, +- FT_Vector* to, ++static int paps_cubic_to( const FT_Vector* control1, ++ const FT_Vector* control2, ++ const FT_Vector* to, + void *user_data) + { + OutlineInfo *outline_info = (OutlineInfo*)user_data; +-- +GitLab + +From caddfcab250fe677ecf294fad835b71e6b10cf26 Mon Sep 17 00:00:00 2001 +From: Hans Breuer +Date: Fri, 3 Oct 2014 22:26:36 +0200 +Subject: [PATCH] [warningectomy] incompatible pointer types passing ... + +test-boundingbox.c:152:58: warning: incompatible pointer types passing 'void (const struct _TestBeziers *)' to parameter of type 'GTestDataFunc' (aka 'void (*)(gconstpointer)') [-Wincompatible-pointer-types] + g_test_add_data_func (testpath, &_test_beziers[i], _check_one_bezier); + ^~~~~~~~~~~~~~~~~ +test-svg.c:117:55: warning: incompatible pointer types passing 'void (const PathData *)' to parameter of type 'GTestDataFunc' (aka 'void (*)(gconstpointer)') [-Wincompatible-pointer-types] + g_test_add_data_func (testpath, &_test_path[i], _check_one_path); + ^~~~~~~~~~~~~~~ +--- a/tests/test-boundingbox.c ++++ b/tests/test-boundingbox.c +@@ -132,8 +132,9 @@ static struct _TestBeziers { + #undef BEZ + + static void +-_check_one_bezier (const struct _TestBeziers *test) ++_check_one_bezier (gconstpointer p) + { ++ const struct _TestBeziers *test = p; + Rectangle rect; + PolyBBExtras extra = {0, T*.7, T*.7, T*.7, 0 }; + +Backport from https://gitlab.gnome.org/GNOME/dia/-/commit/9c481f649414190bf8d6741cbca1777e9766756b + +--- a/tests/test-objects.c ++++ b/tests/test-objects.c.g_test_add_data_func_2 +@@ -39,8 +39,9 @@ + int num_objects = 0; + + static void +-_test_creation (const DiaObjectType *type) ++_test_creation (gconstpointer user_data) + { ++ const DiaObjectType *type = (const DiaObjectType *)user_data; + int i; + Handle *h1 = NULL, *h2 = NULL; + Point point = {0, 0}; +@@ -112,8 +113,9 @@ + } + + static void +-_test_copy (const DiaObjectType *type) ++_test_copy (gconstpointer user_data) + { ++ const DiaObjectType *type = (const DiaObjectType *)user_data; + Handle *h1 = NULL, *h2 = NULL; + Point from = {0, 0}; + DiaObject *oc, *o = type->ops->create (&from, type->default_user_data, &h1, &h2); +@@ -172,8 +174,9 @@ + } + + static void +-_test_movement (const DiaObjectType *type) ++_test_movement (gconstpointer user_data) + { ++ const DiaObjectType *type = (const DiaObjectType *)user_data; + Handle *h1 = NULL, *h2 = NULL; + Point from = {0, 0}; + DiaObject *o = type->ops->create (&from, type->default_user_data, &h1, &h2); +@@ -215,8 +218,9 @@ + } + + static void +-_test_change (const DiaObjectType *type) ++_test_change (gconstpointer user_data) + { ++ const DiaObjectType *type = (const DiaObjectType *)user_data; + Handle *h1 = NULL, *h2 = NULL; + Point from = {0, 0}; + DiaObject *o = type->ops->create (&from, type->default_user_data, &h1, &h2); + +Backport from https://gitlab.gnome.org/GNOME/dia/-/commit/f57ea2685034ddbafc19f35d9b525a12283d7c24 + +--- a/lib/prop_geomtypes.c ++++ b/lib/prop_geomtypes.c.get_data_size +@@ -129,9 +129,10 @@ + } + + static int +-realprop_get_data_size(RealProperty *prop) ++realprop_get_data_size(void) + { +- return sizeof (prop->real_data); ++ RealProperty prop; ++ return sizeof (prop.real_data); + } + + static const PropertyOps realprop_ops = { +@@ -242,9 +243,10 @@ + } + + static int +-lengthprop_get_data_size(LengthProperty *prop) ++lengthprop_get_data_size(void) + { +- return sizeof (prop->length_data); ++ LengthProperty prop; ++ return sizeof (prop.length_data); + } + + static const PropertyOps lengthprop_ops = { +@@ -358,9 +360,10 @@ + } + + static int +-fontsizeprop_get_data_size(FontsizeProperty *prop) ++fontsizeprop_get_data_size(void) + { +- return sizeof (prop->fontsize_data); ++ FontsizeProperty prop; ++ return sizeof (prop.fontsize_data); + } + + static const PropertyOps fontsizeprop_ops = { +--- a/lib/prop_inttypes.c ++++ b/lib/prop_inttypes.c.get_data_size +@@ -122,9 +122,10 @@ + } + + static int +-charprop_get_data_size(CharProperty *prop) ++charprop_get_data_size(void) + { +- return sizeof (prop->char_data); ++ CharProperty prop; ++ return sizeof (prop.char_data); + } + + +@@ -229,9 +230,10 @@ + } + + static int +-boolprop_get_data_size(BoolProperty *prop) ++boolprop_get_data_size(void) + { +- return sizeof (prop->bool_data); ++ BoolProperty prop; ++ return sizeof (prop.bool_data); + } + + +@@ -339,9 +341,10 @@ + } + + static int +-intprop_get_data_size(IntProperty *prop) ++intprop_get_data_size(void) + { +- return sizeof (prop->int_data); ++ IntProperty prop; ++ return sizeof (prop.int_data); + } + + static const PropertyOps intprop_ops = { +--- a/lib/prop_text.c ++++ b/lib/prop_text.c.get_data_size +@@ -208,9 +208,10 @@ + } + + static int +-stringprop_get_data_size(StringProperty *prop) ++stringprop_get_data_size(void) + { +- return sizeof (prop->string_data); /* only the pointer */ ++ StringProperty prop; ++ return sizeof (prop.string_data); /* only the pointer */ + } + + static StringListProperty * +--- a/lib/properties.h ++++ b/lib/properties.h.get_data_size +@@ -116,7 +116,7 @@ + void *base, guint offset, guint offset2); + typedef void (*PropertyType_SetFromOffset)(Property *prop, + void *base, guint offset, guint offset2); +-typedef int (*PropertyType_GetDataSize)(Property *prop); ++typedef int (*PropertyType_GetDataSize)(void); + + + struct _PropertyOps { +--- a/objects/custom/custom_object.c ++++ b/objects/custom/custom_object.c.get_data_size +@@ -372,14 +372,7 @@ + info->prop_offsets[i].name = info->props[i].name; + info->prop_offsets[i].type = info->props[i].type; + info->prop_offsets[i].offset = offs; +- /* FIXME: +- custom_object.c:328: warning: passing arg 1 of pointer to function +- from incompatible pointer type +- We don't have a Property* here so there is not much we can do about. +- Maybe it even works cause the sizeof() in *_get_data_size can be +- calculated at compile time. Anyway, a mess ;) --hb +- */ +- size = info->props[i].ops->get_data_size (&info->props[i]); ++ size = info->props[i].ops->get_data_size (); + info->ext_attr_size += size; + offs += size; + } diff --git a/graphics/dia/patches/dia-0.97.3-configure-clang16.patch b/graphics/dia/patches/dia-0.97.3-configure-clang16.patch new file mode 100644 index 00000000000..0cf797a4ad0 --- /dev/null +++ b/graphics/dia/patches/dia-0.97.3-configure-clang16.patch @@ -0,0 +1,56 @@ +https://bugs.gentoo.org/874729 +https://src.fedoraproject.org/rpms/dia/blob/0a14169fc36b959598074065678e0126830317f8/f/dia-configure-c99.patch + +C99 removes support for implicit ints, so declare the return type +of main explicitly. Future compilers are likely to require explicit +type declarations. + +Upstream has switched to Meson, and it does not seem to use this +particular check anymore. + +https://bugs.gentoo.org/651522 +Remove the insane check for isinf(), since every sane compiler nowadays supports it. + +--- a/configure.in ++++ b/configure.in +@@ -183,7 +183,7 @@ + png_structp pp; + png_infop info; + png_colorp cmap; +- main() { void*foo = png_create_read_struct; }], ++ int main(void) { void*foo = png_create_read_struct; }], + png_ok=yes, + png_ok=no) + LDFLAGS="${old_LDFLAGS}" +@@ -378,28 +378,9 @@ + + dnl Platform-specific fixes. + dnl +- +-dnl Sun Forte C provides isinf() in the unbundled -lsunmath. Solaris +-dnl declares finite() in ieeefp.h. It's preferrable not to link +-dnl to -lsunmath as it's not present on all machines. +-have_isinf=no +-AC_CHECK_HEADERS(math.h, +- AC_CHECK_LIB(m,isinf, +- have_isinf=yes)) +- +-if test "$have_isinf" = "no"; then +- AC_CHECK_HEADER(ieeefp.h, +- [AC_CHECK_FUNC(finite, +- AC_DEFINE(HAVE_IEEEFP_H,1, +- [Define if finite() is defined in ieeefp.h]), +- AC_MSG_ERROR([Can't find a definition of neither +- finite nor isinf]))], +- [AC_MSG_ERROR(Can't find neither a definition of +- isinf nor ieeefp.h)]) +-else +- AC_DEFINE([HAVE_ISINF], 1, +- [Define if the isinf() function is available]) +-fi ++dnl every modern compiler supports C99's isinf() ++AC_DEFINE([HAVE_ISINF], 1, ++ [Define if the isinf() function is available]) + + dnl Alpha needs -mieee or we get a segfault + dnl This shouldn't be needed but is here until a real solution is found diff --git a/graphics/dia/patches/dia-0.97.3-freetype_pkgconfig.patch b/graphics/dia/patches/dia-0.97.3-freetype_pkgconfig.patch new file mode 100644 index 00000000000..c48b5ba66fb --- /dev/null +++ b/graphics/dia/patches/dia-0.97.3-freetype_pkgconfig.patch @@ -0,0 +1,66 @@ +--- dia-0.97.3/configure.in ++++ dia-0.97.3/configure.in +@@ -62,43 +62,26 @@ + + AC_ARG_WITH(freetype, + [ --without-freetype compile without FreeType support],,with_freetype=yes) +-if test "x$with_freetype" = "xyes"; then +-PKG_CHECK_MODULES(PANGOFT2,pangoft2,have_pangoft2=true,have_pangoft2=false) +-if test "$have_pangoft2" = "true"; then +- dnl On Solaris with Forte C, at least, need to link app/dia with -lfreetype. +- dnl It's not enough that -lpangoft2 implicitly pulls it in. +- have_freetype=false +- AC_CHECK_LIB(freetype,FT_Init_FreeType,have_freetype=true,have_freetype=false,`freetype-config --libs`) +- if test "$have_freetype" = "true"; then +- dnl Need 2.0.9, as a bug was fixed for us there. +- dnl However, freetype-config doesn't give a meaningful version, so we must +- dnl do it like this. +- AC_MSG_CHECKING([if FreeType version is 2.0.9 or higher]) +- old_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS `freetype-config --cflags`" +- AC_TRY_CPP([#include +-#include FT_FREETYPE_H +-#if (FREETYPE_MAJOR*1000+FREETYPE_MINOR)*1000+FREETYPE_PATCH < 2000009 +-#error Freetype version too low. +-#endif +-], +- [AC_MSG_RESULT(yes) +- FREETYPE_LIBS=`freetype-config --libs` +- AC_SUBST(FREETYPE_LIBS) +- FREETYPE_CFLAGS=`freetype-config --cflags` +- AC_SUBST(FREETYPE_CFLAGS) +- GTK_MODULES="$GTK_MODULES pangoft2" +- AC_DEFINE(HAVE_FREETYPE,1,[Define if you have the FreeType2 library])] +- , +- [AC_MSG_ERROR([Need FreeType library version 2.0.9 or higher])]) +- CPPFLAGS="$old_CPPFLAGS" +- else +- AC_MSG_ERROR(Can't find FreeType library) +- fi +-else +- AC_MSG_ERROR(Can't find PangoFT2 library) +-fi +-fi ++AS_IF([test "x$with_freetype" = "xyes"],[ ++ dnl freetype2.pc uses the libtool specific version number and not the ++ dnl package version. See ++ dnl https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT ++ dnl Let's raise minimum dependency to freetype-2.4.0 because that's the ++ dnl lowest freetype libtool version I could find. ++ dnl freetype-2.4.0 is from July 2010 and should be reasonably old ++ dnl enough. ++ PKG_CHECK_MODULES(FREETYPE, freetype2 >= 11.0.5, ++ [ ++ CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" ++ AC_DEFINE(HAVE_FREETYPE,1,[Define if you have the FreeType2 library]) ++ ], ++ AC_MSG_ERROR([Need FreeType library version 2.4.0 or higher]) ++ ) ++ PKG_CHECK_MODULES(PANGOFT2,pangoft2, ++ GTK_MODULES="$GTK_MODULES pangoft2", ++ AC_MSG_ERROR(Can't find PangoFT2 library) ++ ) ++]) + AM_CONDITIONAL(WITH_FREETYPE, test "x$with_freetype" != "xno") + + CFLAGS="$FREETYPE_CFLAGS $CFLAGS" diff --git a/graphics/dia/dia-enable-html-docs.patch b/graphics/dia/patches/dia-enable-html-docs.patch similarity index 100% rename from graphics/dia/dia-enable-html-docs.patch rename to graphics/dia/patches/dia-enable-html-docs.patch diff --git a/graphics/djview4/djview4.SlackBuild b/graphics/djview4/djview4.SlackBuild index ef2c76e0270..1e17d62e236 100644 --- a/graphics/djview4/djview4.SlackBuild +++ b/graphics/djview4/djview4.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=djview4 -VERSION=${VERSION:-4.10.6} +VERSION=${VERSION:-4.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -75,7 +75,6 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/djview-$VERSION.tar.gz -mv djview-$VERSION djview4-$VERSION cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -84,10 +83,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -if [ "$QTDIR" == "/opt/kde3/lib/qt3" ]; then - QTDIR=$QT4DIR -fi +for i in $CWD/patches/* ; do patch -p1 < $i ; done + +autoreconf -fi +QMAKE=/usr/bin/qmake-qt5 \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/graphics/djview4/djview4.info b/graphics/djview4/djview4.info index 0352ccd3711..57c567b2769 100644 --- a/graphics/djview4/djview4.info +++ b/graphics/djview4/djview4.info @@ -1,8 +1,8 @@ PRGNAM="djview4" -VERSION="4.10.6" +VERSION="4.12" HOMEPAGE="http://djvu.sourceforge.net/djview4.html" -DOWNLOAD="https://sourceforge.net/projects/djvu/files/DjView/4.10/djview-4.10.6.tar.gz" -MD5SUM="f23205e9d04e4ee4c2324e1d0bae1d1f" +DOWNLOAD="https://downloads.sourceforge.net/djvu/djview-4.12.tar.gz" +MD5SUM="a91328d0fc949a97931511dcd983236b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/djview4/patches/0001-cross-build-pkg-config-info.patch b/graphics/djview4/patches/0001-cross-build-pkg-config-info.patch new file mode 100644 index 00000000000..2f2f46ea2cb --- /dev/null +++ b/graphics/djview4/patches/0001-cross-build-pkg-config-info.patch @@ -0,0 +1,86 @@ +From: Helmut Grohne +Date: Thu, 4 Jan 2018 08:48:09 +0100 +Subject: cross build pkg-config info + +Issue: djview4 FTCBFS: uses custom, broken macro AC_PROG_PKG_CONFIG +See: https://bugs.debian.org/886304 + +djview4 fails to cross build from source, because it uses the build +architecture pkg-config rather than the host architecture one. This is +due to its use of AC_PROG_PKG_CONFIG, which fails to consider +$ac_tool_prefix. After replacing the macro with the upstream macro +PKG_PROG_PKG_CONFIG (from pkg.m4 in pkg-config), the build continues a +bit further and uses the wrong qmake. I need to discuss the qmake issue +with the qt people. Can you apply the attached patch anyway and close +this bug report when doing so? That'd make the qmake failure immediately +visible and thus easier to discuss. +--- + config/acinclude.m4 | 26 ++------------------------ + configure.ac | 3 ++- + 2 files changed, 4 insertions(+), 25 deletions(-) + +diff --git a/config/acinclude.m4 b/config/acinclude.m4 +index 3c78d41..2912000 100644 +--- a/config/acinclude.m4 ++++ b/config/acinclude.m4 +@@ -168,28 +168,6 @@ TIFFOpen(0,0); + + + +- +-dnl ------------------------------------------------------------------ +-dnl @synopsis AC_PROG_PKG_CONFIG([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +-dnl Sets output variables PKG_CONFIG +-dnl ------------------------------------------------------------------ +- +- +-AC_DEFUN([AC_PROG_PKG_CONFIG], +-[ +- AC_ARG_VAR(PKG_CONFIG,[Location of the pkg-config program.]) +- AC_ARG_VAR(PKG_CONFIG_PATH, [Path for pkg-config descriptors.]) +- AC_PATH_PROG(PKG_CONFIG, pkg-config) +- if test -z "$PKG_CONFIG" ; then +- ifelse([$2],,:,[$2]) +- else +- ifelse([$1],,:,[$1]) +- fi +-]) +- +- +- +- + dnl ------------------------------------------------------------------ + dnl @synopsis AC_PATH_DDJVUUAPI([action-if-found],[action-if-notfound]) + dnl Search for ddjvuapi. Defines HAVE_DDJVUAPI. +@@ -198,7 +176,7 @@ dnl ------------------------------------------------------------------ + + AC_DEFUN([AC_PATH_DDJVUAPI], + [ +- AC_REQUIRE([AC_PROG_PKG_CONFIG]) ++ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_ARG_VAR(DDJVUAPI_LIBS, [Libraries for ddjvuapi]) + AC_ARG_VAR(DDJVUAPI_CFLAGS, [Compilation flags for ddjvuapi]) + AC_MSG_CHECKING([for ddjvuapi]) +@@ -236,7 +214,7 @@ dnl ------------------------------------------------------------------ + + AC_DEFUN([AC_PATH_GLIB], + [ +- AC_REQUIRE([AC_PROG_PKG_CONFIG]) ++ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_ARG_VAR(GLIB_LIBS, [Libraries for glib-2.0]) + AC_ARG_VAR(GLIB_CFLAGS, [Compilation flags for glib-2.0]) + AC_MSG_CHECKING([for glib]) +diff --git a/configure.ac b/configure.ac +index 473a456..e93aee8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -172,7 +172,8 @@ AC_CHECK_FUNCS(sigaction strerror waitpid wait3) + # Packages + # ---------------------------------------- + +-AC_PROG_PKG_CONFIG([],[ ++PKG_PROG_PKG_CONFIG ++AS_IF([test -z "$PKG_CONFIG"],[ + AC_MSG_ERROR([Cannot find required program pkg-config.]) + ]) + diff --git a/graphics/djview4/patches/0002-debian-changes.patch b/graphics/djview4/patches/0002-debian-changes.patch new file mode 100644 index 00000000000..059ede331b5 --- /dev/null +++ b/graphics/djview4/patches/0002-debian-changes.patch @@ -0,0 +1,3606 @@ +This is an autogenerated patch header for a single-debian-patch file. The +delta against upstream is either kept as a single patch, or maintained +in some VCS, and exported as a single patch instead of more manageable +atomic patches. + +--- djview4-4.12.orig/README_translations ++++ djview4-4.12/README_translations +@@ -49,11 +49,12 @@ CONTRIBUTORS + + Translations for djview were contributed by: + +-djview_cs.ts Petr Pisar +-djview_de.ts Marc Feld +-djview_es.ts Mike Molina +-djview_fr.ts Leon Bottou +-djview_ru.ts Alexander Potashev +-djview_uk.ts Yuri Chornoivan +-djview_zh_CN/TW.ts Lee Chenhwa ++djview_cs.ts Petr Pisar ++djview_de.ts Marc Feld ++djview_es.ts Mike Molina ++djview_fr.ts Leon Bottou ++djview_ru.ts Alexander Potashev ++djview_uk.ts Yuri Chornoivan ++djview_pl.ts Janusz S. Bień, Tomasz Świerczek ++djview_zh_CN/TW.ts Lee Chenhwa + +--- djview4-4.12.orig/config/acinclude.m4 ++++ djview4-4.12/config/acinclude.m4 +@@ -272,7 +272,7 @@ Unsetting them is better than setting th + path=$QTDIR/bin:$PATH + fi + if test -z "$QMAKE" ; then +- AC_PATH_PROGS([QMAKE], [qmake], [], [$path]) ++ AC_PATH_TOOL([QMAKE], [qmake], [], [$path]) + fi + if test -z "$QMAKE" ; then + AC_MSG_ERROR([Cannot find the Qt program qmake. +@@ -327,7 +327,7 @@ If you define QMAKESPEC, make sure it is + altrcc="rcc-${qtversion}" + altlupdate="lupdate-${qtversion}" + altlrelease="lrelease-${qtversion}" +- else ++ elif test `basename "$QMAKE"` = qmake ; then + AC_MSG_CHECKING([for real qmake path]) + test -x "$QT_INSTALL_BINS/qmake" && QMAKE="$QT_INSTALL_BINS/qmake" + AC_MSG_RESULT([$QMAKE]) +--- djview4-4.12.orig/mac/make_djview_bundle.sh ++++ djview4-4.12/mac/make_djview_bundle.sh +@@ -79,55 +79,51 @@ run rmdir $bundle/bin || exit + run ln -s ./MacOS $bundle/bin || exit + run ln -s ./MacOS $bundle/plugins || exit + +-# copy needed homebrew libraries +-for lib in $(otool -L $bundle/MacOS/ddjvu | awk '/^\t/{print $1}') ; do +- case "$lib" in +- $BREWDIR/*) +- libname=$(basename "$lib") +- test -r "./$bundle/lib/$libname" || \ +- run cp "$lib" "./$bundle/lib/$libname" || exit ;; +- esac +-done + + # copy needed qt plugins + ( cd "$QTDIR" ; \ + ls -1 plugins/{platforms,imageformats,styles,printsupport}/*.dylib | \ +- grep -v libqwebgl.dylib | \ +- grep -v _debug.dylib ) | \ ++ grep -v libqwebgl.dylib | \ ++ grep -v libqpdf.dylib | \ ++ grep -v libqsvg.dylib | \ ++ grep -v _debug.dylib ) | \ + while read plugin ; do + run mkdir -p $bundle/$(dirname "$plugin") || exit + run cp "$QTDIR/$plugin" $bundle/"$plugin" || exit + done + +- +- +-# copy needed libraries +-for loader in \ +- $bundle/MacOS/djview \ +- $bundle/MacOS/*/*.dylib +-do +- for lib in $(otool -L $loader | awk '/^\t/{print $1}') ++# copy needed libraries ++function getlibs() { ++ for loader in $* + do +- if [ $(basename "$lib") != $(basename "$loader") ] +- then +- case "$lib" in +- $BREWDIR/*) +- libname=$(basename "$lib") +- test -r "./$bundle/lib/$libname" || \ +- run cp "$lib" "./$bundle/lib/$libname" || exit ;; +- @rpath/*) +- libname=$(basename "$lib") +- lib="$QTDIR/lib${lib/#@rpath//}" +- test -r "./$bundle/lib/$libname" || \ +- run cp "$lib" "./$bundle/lib/$libname" || exit ;; +- $QTDIR/*) +- libname=$(basename "$lib") +- test -r "./$bundle/lib/$libname" || \ +- run cp "$lib" "./$bundle/lib/$libname" || exit ;; +- esac +- fi ++ for lib in $(otool -L $loader | awk '/^\t/{print $1}') ++ do ++ if [ $(basename "$lib") != $(basename "$loader") ] ++ then ++ case "$lib" in ++ $BREWDIR/*) ++ libname=$(basename "$lib") ++ test -r "./$bundle/lib/$libname" || \ ++ run cp "$lib" "./$bundle/lib/$libname" || exit ;; ++ @rpath/*) ++ libname=$(basename "$lib") ++ lib="$QTDIR/lib${lib/#@rpath//}" ++ test -r "./$bundle/lib/$libname" || \ ++ run cp "$lib" "./$bundle/lib/$libname" || exit ;; ++ $QTDIR/*) ++ libname=$(basename "$lib") ++ test -r "./$bundle/lib/$libname" || \ ++ run cp "$lib" "./$bundle/lib/$libname" || exit ;; ++ esac ++ fi ++ done + done +-done ++} ++getlibs $bundle/MacOS/ddjvu ++getlibs $bundle/MacOS/djview ++getlibs $bundle/MacOS/*/*.dylib ++getlibs $bundle/lib/Qt* ++getlibs $bundle/lib/*.dylib + + # copy translations + languages=$(ls -1 ../src/*.qm | sed -e 's/^[^_]*_//' -e 's/\.qm$//') +--- djview4-4.12.orig/mac/make_djview_dmg.sh ++++ djview4-4.12/mac/make_djview_dmg.sh +@@ -1,6 +1,6 @@ + #!/bin/bash + +-dmgname="DjVuLibre-3.5.27+DjView-4.10.6-intel64" ++dmgname="DjVuLibre-3.5.28+DjView-4.12-intel64-3" + + cd $(dirname $0) + if ! test -d DjView.app ; then +--- djview4-4.12.orig/src/djview.am ++++ djview4-4.12/src/djview.am +@@ -57,3 +57,5 @@ qmake_ts += djview_zh_cn.ts + qmake_qm += djview_zh_cn.qm + qmake_ts += djview_zh_tw.ts + qmake_qm += djview_zh_tw.qm ++qmake_ts += djview_pl.ts ++qmake_qm += djview_pl.qm +--- djview4-4.12.orig/src/djview.pro ++++ djview4-4.12/src/djview.pro +@@ -141,3 +141,4 @@ TRANSLATIONS += djview_ru.ts + TRANSLATIONS += djview_es.ts + TRANSLATIONS += djview_zh_cn.ts + TRANSLATIONS += djview_zh_tw.ts ++TRANSLATIONS += djview_pl.ts +--- /dev/null ++++ djview4-4.12/src/djview_pl.ts +@@ -0,0 +1,3389 @@ ++ ++ ++ ++ ++ Generic ++ ++ ++ thisLanguage ++ Name of THIS language ++ Polski ++ ++ ++ ++ QApplication ++ ++ ++ Option '-fix' is deprecated. ++ Opcja '-fix' jest przestarzała. ++ ++ ++ ++ QDjView ++ ++ ++ cannot open '%1'. ++ nie można otworzyć '%1'. ++ ++ ++ ++ FitWidth ++ zoomCombo ++ Dostosuj szerokość strony ++ ++ ++ ++ FitPage ++ zoomCombo ++ Dostosuj wielkość strony ++ ++ ++ ++ Stretch ++ zoomCombo ++ Rozciągnij ++ ++ ++ ++ 1:1 ++ zoomCombo ++ Wiernie (1:1) ++ ++ ++ ++ 300% ++ zoomCombo ++ 300% ++ ++ ++ ++ 200% ++ zoomCombo ++ 200% ++ ++ ++ ++ 150% ++ zoomCombo ++ 150% ++ ++ ++ ++ 100% ++ zoomCombo ++ 100% ++ ++ ++ ++ 75% ++ zoomCombo ++ 75% ++ ++ ++ ++ 50% ++ zoomCombo ++ 50% ++ ++ ++ ++ Color ++ modeCombo ++ Kolor ++ ++ ++ ++ Stencil ++ modeCombo ++ Translation not obvious, may be controversial ++ Maska ++ ++ ++ ++ Foreground ++ modeCombo ++ Loose controversial translation (~print layer) ++ Front ++ ++ ++ ++ Background ++ modeCombo ++ Tło ++ ++ ++ ++ Hidden Text ++ modeCombo ++ Tekst ukryty ++ ++ ++ ++ &New ++ File| ++ &Nowy ++ ++ ++ ++ Ctrl+N ++ File|New ++ Ctrl+N ++ ++ ++ ++ Create a new DjView window. ++ Otwórz nowe okno DjView. ++ ++ ++ ++ &Open ++ File| ++ &Otwórz ++ ++ ++ ++ Ctrl+O ++ File|Open ++ Ctrl-O ++ ++ ++ ++ Open a DjVu document. ++ Otwórz dokument DjVu. ++ ++ ++ ++ Open &Location... ++ File| ++ Otwórz &adres... ++ ++ ++ ++ Open a remote DjVu document. ++ Otwórz zdalny dokument DjVu. ++ ++ ++ ++ &Close ++ File| ++ &Zamknij ++ ++ ++ ++ Ctrl+W ++ File|Close ++ Ctrl+W ++ ++ ++ ++ Close this window. ++ Zamknij to okno. ++ ++ ++ ++ &Quit ++ File| ++ Za&kończ ++ ++ ++ ++ Ctrl+Q ++ File|Quit ++ Ctrl+Q ++ ++ ++ ++ Close all windows and quit the application. ++ Zamknij wszystkie okna i zakończ aplikację. ++ ++ ++ ++ Save &as... ++ File| ++ Zapisz &jako... ++ ++ ++ ++ Ctrl+S ++ File|SaveAs ++ Ctrl+S ++ ++ ++ ++ Save the DjVu document. ++ Zapisz dokument DjVu. ++ ++ ++ ++ &Export as... ++ File| ++ &Eksportuj jako... ++ ++ ++ ++ Ctrl+E ++ File|ExportAs ++ Ctrl+E ++ ++ ++ ++ Export DjVu page or document to other formats. ++ Eksportuj stronę lub cały dokument DjVu do innych formatów. ++ ++ ++ ++ &Print... ++ File| ++ &Drukuj... ++ ++ ++ ++ Ctrl+P ++ File|Print ++ Ctrl+P ++ ++ ++ ++ Print the DjVu document. ++ Drukuj dokument DjVu. ++ ++ ++ ++ &Find... ++ Edit| ++ &Znajdź... ++ ++ ++ ++ Ctrl+F ++ Edit|Find ++ Ctrl+F ++ ++ ++ ++ Find text in the document. ++ Znajdź tekst w dokumencie. ++ ++ ++ ++ Find &Next ++ Edit| ++ Znajdź &następny ++ ++ ++ ++ F3 ++ Edit|Find Next ++ F3 ++ ++ ++ ++ Find next occurrence of search text in the document. ++ Znajdź następne wystąpienie szukanego tekstu w dokumencie. ++ ++ ++ ++ Find &Previous ++ Edit| ++ Znajdź &poprzedni ++ ++ ++ ++ Shift+F3 ++ Edit|Find Previous ++ Shift+F3 ++ ++ ++ ++ Find previous occurrence of search text in the document. ++ Znajdź poprzednie wystąpienie szukanego tekstu w dokumencie. ++ ++ ++ ++ &Select ++ Edit| ++ &Wybierz ++ ++ ++ ++ F2 ++ Edit|Select ++ F2 ++ ++ ++ ++ Select a rectangle in the document. ++ Zaznacz prostokąt w dokumencie. ++ ++ ++ ++ Zoom &In ++ Zoom| ++ &Powiększ ++ ++ ++ ++ Increase the magnification. ++ Zwiększ powiększenie. ++ ++ ++ ++ Zoom &Out ++ Zoom| ++ &Zmniejsz ++ ++ ++ ++ Decrease the magnification. ++ Zmniejsz powiększenie. ++ ++ ++ ++ Fit &Width ++ Zoom| ++ Dostosuj &szerokość strony ++ ++ ++ ++ Set magnification to fit page width. ++ Dostosuj powiększenie do szerokości strony. ++ ++ ++ ++ Fit &Page ++ Zoom| ++ Dostosuj wielość &trony ++ ++ ++ ++ Set magnification to fit page. ++ Dostosuj powiększenie do wielkości strony. ++ ++ ++ ++ One &to one ++ Zoom| ++ Jeden &do jednego ++ ++ ++ ++ Set full resolution magnification. ++ Ustaw powiększenie zgodne z pełną rozdzielczością. ++ ++ ++ ++ &300% ++ Zoom| ++ &300% ++ ++ ++ ++ Magnify 300% ++ Powiększ 300% ++ ++ ++ ++ &200% ++ Zoom| ++ &200% ++ ++ ++ ++ Magnify 20% ++ Powiększ 20% ++ ++ ++ ++ &150% ++ Zoom| ++ &150% ++ ++ ++ ++ Magnify 150% ++ Powiększ 150% ++ ++ ++ ++ &100% ++ Zoom| ++ &100% ++ ++ ++ ++ Magnify 100% ++ Powiększ 100% ++ ++ ++ ++ &75% ++ Zoom| ++ &75% ++ ++ ++ ++ Magnify 75% ++ Powiększ 75% ++ ++ ++ ++ &50% ++ Zoom| ++ &50% ++ ++ ++ ++ Magnify 50% ++ Powiększ 50% ++ ++ ++ ++ &First Page ++ Go| ++ &Pierwsza strona ++ ++ ++ ++ Jump to first document page. ++ Przejdź do pierwszej strony dokumentu. ++ ++ ++ ++ &Next Page ++ Go| ++ &Następna strona ++ ++ ++ ++ Jump to next document page. ++ Przejdź do następnej strony dokumentu. ++ ++ ++ ++ &Previous Page ++ Go| ++ P&oprzednia strona ++ ++ ++ ++ Jump to previous document page. ++ Przejdź do poprzedniej strony dokumentu. ++ ++ ++ ++ &Last Page ++ Go| ++ &Ostatnia strona ++ ++ ++ ++ Jump to last document page. ++ Przejdź do ostatniej strony dokumentu. ++ ++ ++ ++ &Backward ++ Go| ++ &Wstecz ++ ++ ++ ++ Backward in history. ++ Cofnij się w historii. ++ ++ ++ ++ &Forward ++ Go| ++ &Naprzód ++ ++ ++ ++ Forward in history. ++ Przejdź do przodu w historii. ++ ++ ++ ++ Rotate &Left ++ Rotate| ++ Obróć w &lewo ++ ++ ++ ++ Rotate page image counter-clockwise. ++ Obróć obraz strony w kierunku przeciwnym do ruchu wskazówek zegara. ++ ++ ++ ++ Rotate &Right ++ Rotate| ++ Obróć w &prawo ++ ++ ++ ++ Rotate page image clockwise. ++ Obróć obraz strony w kierunku ruchu wskazówek zegara. ++ ++ ++ ++ Set natural page orientation. ++ Ustaw naturalna orientację strony. ++ ++ ++ ++ Turn page on its left side. ++ Obróć stronę na lewy bok. ++ ++ ++ ++ Turn page upside-down. ++ Obróć stronę do góry nogami. ++ ++ ++ ++ Turn page on its right side. ++ Obróć stronę na prawy bok. ++ ++ ++ ++ &Information... ++ Edit| ++ &Informacje... ++ ++ ++ ++ Ctrl+I ++ Edit|Information ++ Ctrl+I ++ ++ ++ ++ Show information about the document encoding and structure. ++ Pokaż informacje o kodowaniu dokumentu i jego strukturze. ++ ++ ++ ++ &Metadata... ++ Edit| ++ &Metadane... ++ ++ ++ ++ Ctrl+M ++ Edit|Metadata ++ Ctrl+M ++ ++ ++ ++ Show the document and page meta data. ++ Pokaż metadane dokumentu i strony. ++ ++ ++ ++ &About DjView... ++ &O DjView... ++ ++ ++ ++ Show information about this program. ++ Pokaż informacje o tym programie. ++ ++ ++ ++ &Color ++ Display| ++ &Kolor ++ ++ ++ ++ Display everything. ++ Wyświetl wszystkie warstwy. ++ ++ ++ ++ &Stencil ++ Display| ++ &Maska ++ ++ ++ ++ Only display the document bitonal stencil. ++ Wyświetl tylko bitonalną maskę. ++ ++ ++ ++ &Foreground ++ Display| ++ &Front ++ ++ ++ ++ Only display the foreground layer. ++ Wyświetl tylko warstwę frontową. ++ ++ ++ ++ &Background ++ Display| ++ &Tło ++ ++ ++ ++ Only display the background layer. ++ Wyświetl tylko warstwę tła. ++ ++ ++ ++ &Hidden Text ++ Display| ++ &Tekst ukryty ++ ++ ++ ++ Overlay a representation of the hidden text layer. ++ Nałóż na obraz reprezentację tekstu ukrytego. ++ ++ ++ ++ I&nvert Luminance ++ View| ++ &Odwróć luminancję ++ ++ ++ ++ Invert image luminance while preserving hue. ++ Odwróć luminancję obrazu zachowując nasycenie. ++ ++ ++ ++ Prefere&nces... ++ Settings| ++ &Ustawienia... ++ ++ ++ ++ Show the preferences dialog. ++ Pokaż dialog ustawień. ++ ++ ++ ++ Show &Sidebar ++ Settings| ++ Pokaż panel &boczny ++ ++ ++ ++ F9 ++ Settings|Show sidebar ++ F9 ++ ++ ++ ++ Alt+Ctrl+S ++ Settings|Show sidebar ++ Alt+Ctrl+S ++ ++ ++ ++ Show/hide the side bar. ++ Pokaż/ukryj panel boczny. ++ ++ ++ ++ Show &Toolbar ++ Settings| ++ Pokaż pasek &narzędzi ++ ++ ++ ++ F10 ++ Settings|Show toolbar ++ F10 ++ ++ ++ ++ Alt+Ctrl+T ++ Settings|Show toolbar ++ Alt+Ctrl+T ++ ++ ++ ++ Show/hide the standard tool bar. ++ Pokaż/ukryj standardowy pasek narzędzi. ++ ++ ++ ++ Show Stat&usbar ++ Settings| ++ Pokaż pasek &stanu ++ ++ ++ ++ Show/hide the status bar. ++ Pokaż/ukryj pasek stanu. ++ ++ ++ ++ Alt+Ctrl+/ ++ Settings|Show toolbar ++ Alt+Ctrl+/ ++ ++ ++ ++ &Full Screen ++ View| ++ &Pełny ekran ++ ++ ++ ++ F11 ++ View|FullScreen ++ F11 ++ ++ ++ ++ Meta+Ctrl+F ++ View|FullScreen ++ Meta+Ctrl+F ++ ++ ++ ++ Toggle full screen mode. ++ Włącz lub wyłącz tryb pełnoekranowy. ++ ++ ++ ++ &Slide Show ++ View| ++ &Pokaz slajdów ++ ++ ++ ++ Shift+F11 ++ View|Slideshow ++ Shift+F11 ++ ++ ++ ++ Shift+Ctrl+F ++ Settings|Show toolbar ++ Shift+Ctrl+F ++ ++ ++ ++ Toggle slide show mode. ++ Włącz lub wyłącz tryb pokazu slajdów. ++ ++ ++ ++ &Continuous ++ Layout| ++ Wyświetlanie &ciągłe ++ ++ ++ ++ F4 ++ Layout|Continuous ++ F4 ++ ++ ++ ++ Toggle continuous layout mode. ++ Włącz lub wyłącz tryb wyświetlania ciągłego. ++ ++ ++ ++ Side &by Side ++ Layout| ++ &Dwie strony obok siebie ++ ++ ++ ++ F5 ++ Layout|SideBySide ++ F5 ++ ++ ++ ++ Toggle side-by-side layout mode. ++ Włącz lub wyłącz wyświetlanie dwóch stron obok siebie. ++ ++ ++ ++ Co&ver Page ++ Layout| ++ Strona &tytułowa ++ ++ ++ ++ F6 ++ Layout|CoverPage ++ F6 ++ ++ ++ ++ Show the cover page alone in side-by-side mode. ++ Pokaż osobno stronę tytułową w trybie wyświetlania stron obok siebie. ++ ++ ++ ++ &Right to Left ++ Layout| ++ Z &prawej do lewej ++ ++ ++ ++ Shift+F6 ++ Layout|RightToLeft ++ Shift+F6 ++ ++ ++ ++ Show pages right-to-left in side-by-side mode. ++ Pokazuj strony od prawej do lewej w trybie obok siebie. ++ ++ ++ ++ Copy &URL ++ Edit| ++ Kopiuj &URL ++ ++ ++ ++ Save an URL for the current page into the clipboard. ++ Skopiuj do schowka URL bieżącej strony. ++ ++ ++ ++ Ctrl+C ++ Edit|CopyURL ++ Ctrl+C ++ ++ ++ ++ Copy &Outline ++ Edit| ++ Kopiuj &zakładki ++ ++ ++ ++ Save the djvused code for the outline into the clipboard. ++ Skopiuj do schowka zakładki w formacie djvused. ++ ++ ++ ++ Copy &Annotations ++ Edit| ++ Kopiuj &adnotacje ++ ++ ++ ++ Save the djvused code for the page annotations into the clipboard. ++ Skopiuj do schowka adnotacje w formacie djvused. ++ ++ ++ ++ &File ++ File| ++ &Plik ++ ++ ++ ++ Open &Recent ++ Otwórz &poprzednie ++ ++ ++ ++ &Edit ++ Edit| ++ &Edytuj ++ ++ ++ ++ &View ++ View| ++ &Widok ++ ++ ++ ++ ++ &Zoom ++ View|Zoom ++ &Skaluj ++ ++ ++ ++ ++ &Rotate ++ View|Rotate ++ &Obróć ++ ++ ++ ++ ++ &Display ++ View|Display ++ &Pokaż ++ ++ ++ ++ ++ &Go ++ Go| ++ &Przejdź ++ ++ ++ ++ &Settings ++ Settings| ++ &Ustawienia ++ ++ ++ ++ &Help ++ Help| ++ &Pomoc ++ ++ ++ ++ Control Left Mouse Button ++ Control i lewy klawisz myszy ++ ++ ++ ++ Right Mouse Button ++ Prawy klawisz myszy ++ ++ ++ ++ <html><b>Selecting a rectangle.</b><br/> Once a rectangular area is selected, a popup menu lets you copy the corresponding text or image. Instead of using this tool, you can also hold %1 and use the Left Mouse Button.</html> ++ <html><b>Zaznaczenie prostokąta.</b><br/>Po zaznaczeniu prostokąta pojawi się menu podręczne pozwalające skopiować odpowiedni tekst lub obraz. Zamiast używać tego sposobu, można również przytrzymać %1 i użyć lewego klawisza myszy.</html> ++ ++ ++ ++ <html><b>Zooming.</b><br/> Choose a zoom level for viewing the document. Zoom level 100% displays the document for a 100 dpi screen. Zoom levels <tt>Fit Page</tt> and <tt>Fit Width</tt> ensure that the full page or the page width fit in the window. </html> ++ <html><b>Skalowanie.</b><br/> Wybierz stopień powiększenia lub zmniejszenia wyświetlanego dokumentu.Wartość 100% jest odpowiednia dla ekranu o rozdzielczości 100dpi. Wartości <tt>Dostosuj do strony</tt> i <tt>Dostosuj do szerokości</tt>gwarantują, że odpowiednio cała strona lub cała szerokość strony zmieszczą się w oknie. </html> ++ ++ ++ ++ <html><b>Rotating the pages.</b><br/> Choose to display pages in portrait or landscape mode. You can also turn them upside down.</html> ++ <html><b>Obracanie strony.</b><br/> Wybór wyświetlania strony w trybie portretowym lub krajobrazowym. Można również obrócić stronę do góry nogami.</html> ++ ++ ++ ++ <html><b>Display mode.</b><br/> DjVu images compose a background layer and a foreground layer using a stencil. The display mode specifies with layers should be displayed.</html> ++ <html><b>Tryb wyświetlania.</b><br/> Obrazy DjVu są tworzone z warstw frontu i tła za pomocą maski. Tryb wyświetlania określa, które warstwy będą wyświetlane.</html> ++ ++ ++ ++ <html><b>Navigating the document.</b><br/> The page selector lets you jump to any page by name and can be activated at any time by pressing Ctrl+G. The navigation buttons jump to the first page, the previous page, the next page, or the last page. </html> ++ <html><b>Nawigacja w dokumencie.</b><br/> Selektor strony pozwala przejść do dowolnej strony i może być aktywowany w dowolnym momencie przez naciśnięcie CTRL+G. Przyciski nawigacyjne powodują przejście do pierwszej, poprzedniej, następnej lub ostatniej strony. </html> ++ ++ ++ ++ <html><b>Document and page information.</b><br> Display a dialog window for viewing encoding information pertaining to the document or to a specific page.</html> ++ <html><b>Informacje o stronie i dokumentacje.</b><br> Pokaż okno dialogowe w celu wyświetlenia informacji o kodowaniu dotyczącej dokumentu lub konkretnej strony.</html> ++ ++ ++ ++ <html><b>Document and page metadata.</b><br> Display a dialog window for viewing metadata pertaining to the document or to a specific page.</html> ++ <html><b>Metadane dokumentu i strony.</b><br> Pokaż okno dialogowe w celu wyświetlenia metadanych dotyczących dokumentu lub konkretnej strony.</html> ++ ++ ++ ++ <html><b>Continuous layout.</b><br/> Display all the document pages arranged vertically inside the scrollable document viewing area.</html> ++ <html><b>Wyświetlanie ciągłe.</b><br/> Wyświetl wszystkie strony dokumentu ustawione pionowe wewnątrz przewijalnego obszaru wyświetlania.</html> ++ ++ ++ ++ <html><b>Side by side layout.</b><br/> Display pairs of pages side by side inside the scrollable document viewing area.</html> ++ <html><b>Wyświetlanie stron obok siebie.</b><br/> Wyświetlaj dwie strony obok siebie wewnątrz przewijalnego obszaru wyświetlania.</html> ++ ++ ++ ++ <html><b>Page information.</b><br/> Display information about the page located under the cursor: the sequential page number, the page size in pixels, and the page resolution in dots per inch. </html> ++ <html><b>Informacja o stronie.</b><br/> Wyświetl informacje o stronie znajdującej się pod kursorem: numer kolejny, rozmiar strony w pikselach i rozdzielczość strony w punktach na cal. </html> ++ ++ ++ ++ <html><b>Cursor information.</b><br/> Display the position of the mouse cursor expressed in page coordinates. </html> ++ <html><b>Informacja o kursorze.</b><br/> Wyświetl pozycję kursora wyrażoną we współrzędnych strony. </html> ++ ++ ++ ++ <html><b>Document viewing area.</b><br/> This is the main display area for the DjVu document. <ul><li>Arrows and page keys to navigate the document.</li><li>Space and BackSpace to read the document.</li><li>Keys <tt>+</tt> <tt>-</tt> <tt>[</tt> <tt>]</tt> to zoom or rotate the document.</li><li>Left Mouse Button for panning and selecting links.</li><li>%3 for displaying the contextual menu.</li><li>%1 Left Mouse Button for selecting text or images.</li><li>%2 for popping the magnification lens.</li></ul></html> ++ <html><b>Obszar wyświetlania dokumentu.</b><br/> To jest główny obszar wyświetlania dokumentu DjVu. <ul><li>Klawisze strzałek i strony nawigują w dokumencie.</li><li>Space i BackSpace przewijają dokument.</li><li>Klawisze <tt>+</tt> <tt>-</tt> <tt>[</tt> <tt>]</tt> skalują lub obracają dokument.</li><li>Lewy klawisz myszy pozycjonuje i wybiera.hiperłącza</li><li>%3 wyświetla menu kontekstowe.</li><li>%1 lewy klawisz myszy wybiera tekst lub obraz.</li><li>%2 uaktywnia lupę.</li></ul></html> ++ ++ ++ ++ <html><b>Document viewing area.</b><br/> This is the main display area for the DjVu document. But you must first open a DjVu document to see anything.</html> ++ <html><b>Obszar wyświetlania dokumentu.</b><br/> To jest główny obszar wyświetlania dokumentu DjVu. Aby cokolwiek zobaczyć trzeba najpierw otworzyć jakiś dokument DjVu.</html> ++ ++ ++ ++ Option '%1' requires boolean argument. ++ Opcja '%1' wymaga argumentu boolowskiego. ++ ++ ++ ++ Illegal value '%2' for option '%1'. ++ Niepoprawna wartość '%2' dla opcji '%1'. ++ ++ ++ ++ Toolbar option '%1' is not implemented. ++ Opcja paska narzędziowego '%1' nie jest zaimplementowana. ++ ++ ++ ++ Toolbar option '%1' is not recognized. ++ Opcja paska narzędzi '%1' nie jest rozpoznana. ++ ++ ++ ++ ++ Option '%1' requires a standalone viewer. ++ Opcja '%1' wymaga samodzielnej przeglądarki. ++ ++ ++ ++ Deprecated option '%1' ++ Przestarzała opcja '%1' ++ ++ ++ ++ Option '%1' is not implemented. ++ Opcja '%1' nie jest zaimplementowana. ++ ++ ++ ++ Option '%1' is not recognized. ++ Opcja '%1' nie jest rozpoznana. ++ ++ ++ ++ ++ DjView ++ DjView ++ ++ ++ ++ Thumbnails ++ Miniaturki ++ ++ ++ ++ Outline ++ Zakładki ++ ++ ++ ++ Find ++ Znajdź ++ ++ ++ ++ Cannot open file '%1'. ++ Nie można otworzyć pliku '%1'. ++ ++ ++ ++ Opening DjVu file ++ Otwieranie pliku DjVu ++ ++ ++ ++ Cannot open URL '%1'. ++ Nie można otworzyć URL '%1'. ++ ++ ++ ++ Opening DjVu document ++ Otwieranie dokumentu DjVu ++ ++ ++ ++ Certificate validation error - DjView ++ dialog caption ++ Błąd weryfikacji certyfikatu - DjView ++ ++ ++ ++ <html> %1 Do you want to continue anyway? </html> ++ <html> %1 Czy chcesz mimo to kontynuować? </html> ++ ++ ++ ++ Cannot find page numbered: %1 ++ Nie można znaleźć strony o numerze: %1 ++ ++ ++ ++ ++ Cannot find page named: %1 ++ Nie można znaleźć strony nazwanej %1 ++ ++ ++ ++ Unrecognized sidebar options '%1'. ++ Nierozpoznana opcja panelu bocznego '%1'. ++ ++ ++ ++ ++ Print - DjView ++ dialog caption ++ Drukuj - DjView ++ ++ ++ ++ <html> This file was served with printing restrictions. Do you want to print it anyway?</html> ++ <html> Ten plik został udostępniony z ograniczeniami drukowania. Czy drukować mimo tego?</html> ++ ++ ++ ++ ++ Save - DjView ++ dialog caption ++ Zapisz - DjView ++ ++ ++ ++ <html> This file was served with saving restrictions. Do you want to save it anyway?</html> ++ <html> Ten plik został udostępniony z ograniczeniami zapisywania. Czy zapisać mimo tego?</html> ++ ++ ++ ++ Export - DjView ++ dialog caption ++ Eksport - DjView ++ ++ ++ ++ Text files ++ save filter ++ Pliki tekstowe ++ ++ ++ ++ ++ All files ++ save filter ++ Wszystkie pliki ++ ++ ++ ++ Save Text - DjView ++ dialog caption ++ Zapisz tekst - DjView ++ ++ ++ ++ ++ ++ Error - DjView ++ dialog caption ++ Błąd - DjView ++ ++ ++ ++ ++ Cannot write file '%1'. ++%2. ++ Nie można zapisać pliku '%1'. ++%2. ++ ++ ++ ++ %1 files (*.%2);; ++ save image filter ++ Translation depends on the numer: 1 plik, 2 pliki, 5 plików,..,101 plik etc. ++ %1 plików (*.%2);; ++ ++ ++ ++ Save Image - DjView ++ dialog caption ++ Zapisz obraz - DjView ++ ++ ++ ++ Cannot determine file format. ++Filename '%1' has no suffix. ++ Nie można rozpoznać formatu pliku. ++Nazwa pliku '%1' nie ma rozszerzenia. ++ ++ ++ ++ Image format %1 not supported. ++ Format obrazu %1 nie jest obsługiwany. ++ ++ ++ ++ Cannot decode page %1. ++ Nie można zdekodować strony %1. ++ ++ ++ ++ Cannot decode document. ++ Nie można zdekodować dokumentu. ++ ++ ++ ++ Decoding DjVu document ++ Dekodowanie dokumentu DjVu ++ ++ ++ ++ P%1/%2 %3x%4 %5dpi ++ P%1/%2 %3x%4 %5dpi ++ ++ ++ ++ x=%1 y=%2 ++ x=%1 y=%2 ++ ++ ++ ++ %3x%4+%1+%2 ++ %3x%4+%1+%2 ++ ++ ++ ++ Go: 1 page forward. ++ Przejdź: 1 strona naprzód. ++ ++ ++ ++ Go: %n pages forward. ++ ++ Przejdź: %n strona naprzód. ++ Przejdź: %n strony naprzód. ++ Przejdź: %n stron naprzód. ++ ++ ++ ++ ++ Go: 1 page backward. ++ Przejdź: 1 strona wstecz. ++ ++ ++ ++ Go: %n pages backward. ++ ++ Przejdź: %n strona wstecz. ++ Przejdź: %n strony wstecz. ++ Przejdź: %n stron wstecz. ++ ++ ++ ++ ++ ++ Go: page %1. ++ Przejdź: strona %1. ++ ++ ++ ++ Go: %1 ++ Przejdź: %1 ++ ++ ++ ++ (in other window.) ++ (w osobnym oknie.) ++ ++ ++ ++ Cannot resolve link '%1' ++ Nie działa hiperłącze '%1' ++ ++ ++ ++ %n characters ++ ++ %n znak ++ %n znaki ++ %n znaków ++ ++ ++ ++ ++ Copy text (%1) ++ Kopiuj tekst (%1) ++ ++ ++ ++ Save text as... ++ Zapisz tekst jako... ++ ++ ++ ++ Copy text into the clipboard. ++ Skopiuj tekst do schowka. ++ ++ ++ ++ Save text into a file. ++ Zapisz tekst w pliku. ++ ++ ++ ++ Copy image (%1x%2 pixels) ++ Kopiuj obraz (%1x%2 piksele) ++ ++ ++ ++ Save image as... ++ Zapisz obraz jako... ++ ++ ++ ++ Copy image into the clipboard. ++ Skopiuj obraz do schowka. ++ ++ ++ ++ Save image into a file. ++ Zapisz obraz w pliku. ++ ++ ++ ++ Zoom to rectangle ++ Powiększ zaznaczenie ++ ++ ++ ++ Zoom the selection to fit the window. ++ Powiększ zaznaczenia na całe okno. ++ ++ ++ ++ Copy URL ++ Kopiuj URL ++ ++ ++ ++ Save into the clipboard an URL that highlights the selection. ++ Zapisz w schowku adres URL który podświetla zaznaczenie. ++ ++ ++ ++ Copy Maparea ++ Kopiuj obszar adnotacji ++ ++ ++ ++ Save into the clipboard a maparea annotation expression for program djvused. ++ Kopiuj do schowka obszar adnotacji w formacie djvused. ++ ++ ++ ++ About DjView ++ O DjView ++ ++ ++ ++ DjVu files ++ Pliki DjVu ++ ++ ++ ++ All files ++ Wszystkie pliki ++ ++ ++ ++ Open - DjView ++ dialog caption ++ Otwórz - DjView ++ ++ ++ ++ Open Location - DjView ++ dialog caption ++ Otwórz adres - DjView ++ ++ ++ ++ Enter the URL of a DjVu document: ++ Wpisz URL dokumentu DjVu: ++ ++ ++ ++ Information - DjView ++ dialog caption ++ Informacje - DjView ++ ++ ++ ++ Metadata - DjView ++ dialog caption ++ Metadane - DjView ++ ++ ++ ++ &Clear History ++ &Wyczyść historię ++ ++ ++ ++ QDjView::NetOpen ++ ++ ++ Cannot open URL '%1'. ++ Nie można otworzyć URL '%1'. ++ ++ ++ ++ Opening DjVu document ++ Otwieranie dokumentu DjVu ++ ++ ++ ++ Cannot spawn a browser for url '%1' ++ Nie można uruchomić przeglądarki dla URL '%1' ++ ++ ++ ++ QDjViewApplication ++ ++ ++ cannot open '%1'. ++ nie można otworzyć '%1'. ++ ++ ++ ++ Usage: djview [options] [filename-or-url] ++Common options include: ++-help~~~Prints this message. ++-verbose~~~Prints all warning messages. ++-display <xdpy>~~~Select the X11 display <xdpy>. ++-geometry <xgeom>~~~Select the initial window geometry. ++-font <xlfd>~~~Select the X11 name of the main font. ++-style <qtstyle>~~~Select the QT user interface style. ++-fullscreen, -fs~~~Start djview in full screen mode. ++-page=<page>~~~Jump to page <page>. ++-zoom=<zoom>~~~Set zoom factor. ++-continuous=<yn>~~~Set continuous layout. ++-sidebyside=<yn>~~~Set side-by-side layout. ++ ++ Are the options really common? ++ Użycie: djview [opcje] [plik-lub-URL] ++Ważniejsze opcje: ++-help~~~Drukuj ten komunikat. ++-verbose~~~Drukuj wszystkie ostrzeżenia. ++-display <xdpy>~~~Wybierz obszar X11 <xdpy>. ++-geometry <xgeom>~~~Wybierz początkową geometrię okna. ++-font <xlfd>~~~Wybierz nazwę X11 głównego fontu. ++-style <qtstyle>~~~Wybierz styl interfejsu QT. ++-fullscreen, -fs~~~Uruchom djview w trybie pełnoekranowym. ++-page=<page>~~~Przejdź do strony <page>. ++-zoom=<zoom>~~~Ustaw wartość skalowania. ++-continuous=<yn>~~~Ustaw wyświetlanie ciągłe. ++-sidebyside=<yn>~~~Ustaw wyświetlanie stron obok siebie. ++ ++ ++ ++ ++ QDjViewAuthDialog ++ ++ ++ Password: ++ Hasło: ++ ++ ++ ++ User: ++ Użytkownik: ++ ++ ++ ++ Authentication required - DjView ++ Wymagane uwierzytelnienie - DjView ++ ++ ++ ++ QDjViewDjVuExporter ++ ++ ++ DjVu Bundled Document ++ Dokument scalony DjVu ++ ++ ++ ++ ++ DjVu Files (*.djvu *.djv) ++ Pliki DjVu (*.djvu *.djv) ++ ++ ++ ++ DjVu Indirect Document ++ Dokument rozłożony DjVu ++ ++ ++ ++ Question - DjView ++ dialog caption ++ Pytanie - DjView ++ ++ ++ ++ <html> This file belongs to a non empty directory. Saving an indirect document creates many files in this directory. Do you want to continue and risk overwriting files in this directory?</html> ++ <html> Ten plik należy do niepustego katalogu.Zapisanie dokumentu rozłożonego stworzy wiele plików w tym katalogu. Czy kontynuować ryzykując zastąpienie plików w tym katalogu?</html> ++ ++ ++ ++ Con&tinue ++ &Kontynuuj ++ ++ ++ ++ &Cancel ++ &Anuluj ++ ++ ++ ++ Unknown error. ++ Nieznany błąd. ++ ++ ++ ++ System error: %1. ++ Błąd systemowy: %1. ++ ++ ++ ++ Save job creation failed! ++ Nie powiodło się utworzenie zadania zapisywania! ++ ++ ++ ++ QDjViewErrorDialog ++ ++ ++ ++ DjView Error ++ Błąd DjView ++ ++ ++ ++ &Ok ++ &OK ++ ++ ++ ++ Error - DjView ++ dialog caption ++ Błąd - DjView ++ ++ ++ ++ QDjViewExportDialog ++ ++ ++ Dialog ++ Dialog ++ ++ ++ ++ ++ Export ++ Eksport ++ ++ ++ ++ &Document ++ &Dokument ++ ++ ++ ++ C&urrent page ++ &Bieżąca strona ++ ++ ++ ++ &Pages ++ &Strony ++ ++ ++ ++ to ++ do ++ ++ ++ ++ Destination ++ Plik wynikowy ++ ++ ++ ++ Format: ++ Format: ++ ++ ++ ++ &Defaults ++ D&omyślne ++ ++ ++ ++ &Ok ++ &OK ++ ++ ++ ++ ++ &Cancel ++ &Anuluj ++ ++ ++ ++ Stop ++ Stop ++ ++ ++ ++ <html><b>Saving.</b><br/> You can save the whole document or a page range under a variety of formats. Selecting certain formats creates additional dialog pages for specifying format options.</html> ++ <html><b>Zapisywanie.</b><br/> Można zapisać cały dokument lub zakres stron w jednym z kilku formatów. Wybór niektórych formatów otworzy dodatkowe strony dialogowe z parametrami specyficznymi dla danego formatu.</html> ++ ++ ++ ++ Error - DjView ++ dialog caption ++ Błąd - DjView ++ ++ ++ ++ Overwriting the current file is not allowed! ++ Nie można zastąpić bieżącego pliku! ++ ++ ++ ++ Question - DjView ++ dialog caption ++ Pytanie - DjView ++ ++ ++ ++ A file with this name already exists. ++Do you want to replace it? ++ Plik o tej nazwie już istnieje ++Czy go zastąpić? ++ ++ ++ ++ &Replace ++ &Zastąp ++ ++ ++ ++ This operation has failed. ++ Ta operacja nie powiodła się. ++ ++ ++ ++ This operation has been interrupted. ++ Ta operacja została przerwana. ++ ++ ++ ++ All files ++ save filter ++ Wszystkie pliki ++ ++ ++ ++ Export - DjView ++ dialog caption ++ Eksport - DjView ++ ++ ++ ++ QDjViewExportPS1 ++ ++ ++ Form ++ Not sure about the meaning ++ Formularz ++ ++ ++ ++ Color ++ Kolorystyka ++ ++ ++ ++ &Color ++ &Kolor ++ ++ ++ ++ &GrayScale ++ &Skala szarości ++ ++ ++ ++ Marks ++ Znaczniki ++ ++ ++ ++ Print image &frame ++ Drukuj z &ramką ++ ++ ++ ++ Print crop &marks ++ Zaznacz &cięcia ++ ++ ++ ++ PostScript ++ PostScript ++ ++ ++ ++ Language Level ++ Poziom języka ++ ++ ++ ++ QDjViewExportPS2 ++ ++ ++ Form ++ Formularz ++ ++ ++ ++ Scaling ++ Skalowanie ++ ++ ++ ++ Scale to &fit the page ++ Dopasuj do &strony ++ ++ ++ ++ &Zoom ++ &Skala ++ ++ ++ ++ % ++ % ++ ++ ++ ++ Orientation ++ Orientacja ++ ++ ++ ++ Automatic ++ Automatyczna ++ ++ ++ ++ &Portrait ++ &Portret ++ ++ ++ ++ &Landscape ++ &Krajobraz ++ ++ ++ ++ QDjViewExportPS3 ++ ++ ++ Form ++ Formularz ++ ++ ++ ++ Print sheets suitable for folding a booklet. ++ Drukuj strony do złożenia w broszurę. ++ ++ ++ ++ Advanced ++ Zaawansowane ++ ++ ++ ++ Sheets per booklet: ++ Liczba stron broszury: ++ ++ ++ ++ Unlimited ++ Nieograniczona ++ ++ ++ ++ at most ++ co najwyżej ++ ++ ++ ++ Print ++ Drukuj ++ ++ ++ ++ rectos and versos. ++ recto i verso. ++ ++ ++ ++ rectos only. ++ tylko recto. ++ ++ ++ ++ versos only. ++ tylko verso. ++ ++ ++ ++ Shift rectos and versos by ++ Zwiększ margines przy grzbiecie ++ ++ ++ ++ points. ++ Translation depends on the number ++ punktów. ++ ++ ++ ++ Center: ++ Wyśrodkuj: ++ ++ ++ ++ points ++ pkt ++ ++ ++ ++ plus ++ plus ++ ++ ++ ++ /100 ++ /100 ++ ++ ++ ++ per page. ++ na stronę. ++ ++ ++ ++ QDjViewExportPrn ++ ++ ++ Form ++ Formularz ++ ++ ++ ++ Color ++ Kolorystyka ++ ++ ++ ++ &Color ++ &Kolor ++ ++ ++ ++ &GrayScale ++ &Skala szarości ++ ++ ++ ++ Marks ++ Znaczniki ++ ++ ++ ++ Print image &frame ++ &Ramka ++ ++ ++ ++ Print crop &marks ++ &Cięcia ++ ++ ++ ++ Scaling ++ Skalowanie ++ ++ ++ ++ Scale to &fit the page ++ Dopasuj do &strony ++ ++ ++ ++ &Zoom ++ &Skaluj ++ ++ ++ ++ % ++ ++ ++ ++ ++ Orientation ++ Orientacja ++ ++ ++ ++ Automatic ++ Automatyczna ++ ++ ++ ++ &Portrait ++ &Portret ++ ++ ++ ++ &Landscape ++ &Krajobraz ++ ++ ++ ++ QDjViewExportTiff ++ ++ ++ Form ++ Formularz ++ ++ ++ ++ Resolution ++ Rozdzielczość ++ ++ ++ ++ Maximum image resolution ++ Maksymalna rozdzielczość ++ ++ ++ ++ dpi ++ dpi ++ ++ ++ ++ Compression ++ Kompresja ++ ++ ++ ++ Force &bitonal G4 compression. ++ Wymuś &bitonalną kompresję G4. ++ ++ ++ ++ Allow &lossy JPEG compression. ++ Zezwól na &stratną kompresję JPEG. ++ ++ ++ ++ JPEG &quality ++ &Jakość JPEG ++ ++ ++ ++ Allow &deflate compression. ++ Zezwól na kompresję &deflate. ++ ++ ++ ++ QDjViewFind ++ ++ ++ Case sensitive ++ Kaszta (wielkość) liter ma znaczenie ++ ++ ++ ++ Words only ++ Tylko całe słowa ++ ++ ++ ++ Regular expression ++ Wyrażenie regularne ++ ++ ++ ++ Find Previous (Shift+F3) ++ Znajdź poprzedni (Shift+F3) ++ ++ ++ ++ Find Next (F3) ++ Znajdź następny (F3) ++ ++ ++ ++ Reset search options to default values. ++ Przywróć domyślne wartości opcji wyszukiwania. ++ ++ ++ ++ Options ++ Opcje ++ ++ ++ ++ <html><b>Finding text.</b><br/> Search hits appear progressively as soon as you type a search string. Typing enter jumps to the next hit. To move to the previous or next hit, you can also use the arrow buttons or the shortcuts <tt>F3</tt> or <tt>Shift-F3</tt>. You can also double click a page name. Use the <tt>Options</tt> menu to search words only or to specify the case sensitivity.</html> ++ <html><b>Znajdowanie tekstu.</b><br/> Wyniki wyszukiwania pokazują się sukcesywnie w miarę wprowadzania szukanego napisu. Naciśnięcie Enter przechodzi do następnego wyniku. Można również używać strzałek, aby przejść do poprzedniego lub następnego wyniku, można także używać przycisków strzałek lub klawiszy funkcyjnych <tt>F3</tt> or <tt>Shift-F3</tt>. Można także dwukrotnie kliknąć na nazwę strony na liście wyników. Użyj menu <tt>Opcje</tt> aby szukać tylko całych słów lub uwzględnić kasztę (wielkość) liter.</html> ++ ++ ++ ++ Specify whether search hits must begin on a word boundary. ++ Określ, czy znalezione wyniki muszą zaczynać się na granicy słów. ++ ++ ++ ++ Specify whether searches are case sensitive. ++ Określ, czy wyszukiwanie ma uwzględniać kasztę (wielkość) liter. ++ ++ ++ ++ Regular expressions describe complex string matching patterns. ++ Loose translation ++ Wyrażenia regularne opisują złożone wzorce porównywania napisów. ++ ++ ++ ++ <html><b>Regular Expression Quick Guide</b><ul><li>The dot <tt>.</tt> matches any character.</li><li>Most characters match themselves.</li><li>Prepend a backslash <tt>\</tt> to match special characters <tt>()[]{}|*+.?!^$\</tt>.</li><li><tt>\b</tt> matches a word boundary.</li><li><tt>\w</tt> matches a word character.</li><li><tt>\d</tt> matches a digit character.</li><li><tt>\s</tt> matches a blank character.</li><li><tt>\n</tt> matches a newline character.</li><li><tt>[<i>a</i>-<i>b</i>]</tt> matches characters in range <tt><i>a</i></tt>-<tt><i>b</i></tt>.</li><li><tt>[^<i>a</i>-<i>b</i>]</tt> matches characters outside range <tt><i>a</i></tt>-<tt><i>b</i></tt>.</li><li><tt><i>a</i>|<i>b</i></tt> matches either regular expression <tt><i>a</i></tt> or regular expression <tt><i>b</i></tt>.</li><li><tt><i>a</i>{<i>n</i>,<i>m</i>}</tt> matches regular expression <tt><i>a</i></tt> repeated <tt><i>n</i></tt> to <tt><i>m</i></tt> times.</li><li><tt><i>a</i>?</tt>, <tt><i>a</i>*</tt>, and <tt><i>a</i>+</tt> are shorthands for <tt><i>a</i>{0,1}</tt>, <tt><i>a</i>{0,}</tt>, and <tt><i>a</i>{1,}</tt>.</li><li>Use parentheses <tt>()</tt> to group regular expressions before <tt>?+*{</tt>.</li></ul></html> ++ <html><b>Uproszczony opis wyrażeń regularnych</b><ul><li>Kropka <tt>.</tt> uzgadnia się z każdym znakiem.</li><li>Większość znaków uzgadnia się ze sobą.</li><li> Aby uzgodnić znaki specjalne <tt>()[]{}|*+.?!^$\</tt>.</li>poprzedź je ukośnikiem wstecznym <tt>\</tt><li><tt>\b</tt> uzgadnia się z granicą słów.</li><li><tt>\w</tt> uzgadnia się ze znakiem alfabetycznym.</li><li><tt>\d</tt> uzgadnia się ze znakiem cyfry.</li><li><tt>\s</tt> uzgadnia się ze spacją.</li><li><tt>\n</tt>uzgadnia się ze znakiem nowej linii.</li><li><tt>[<i>a</i>-<i>b</i>]</tt> uzgadnia się ze znakami z przedziału <tt><i>a</i></tt>-<tt><i>b</i></tt>.</li><li><tt>[^<i>a</i>-<i>b</i>]</tt> uzgadnia się ze znakami spoza przedziału <tt><i>a</i></tt>-<tt><i>b</i></tt>.</li><li><tt><i>a</i>|<i>b</i></tt> uzgadnia się z wyrażeniem regularnym <tt><i>a</i></tt> lub wyrażeniem regularnym <tt><i>b</i></tt>.</li><li><tt><i>a</i>{<i>n</i>,<i>m</i>}</tt> uzgadnia się z wyrażeniem regularnym <tt><i>a</i></tt>powtórzonym od <tt><i>n</i></tt> do <tt><i>m</i></tt> razy.</li><li><tt><i>a</i>?</tt>, <tt><i>a</i>*</tt>, and <tt><i>a</i>+</tt> są skrótem dla <tt><i>a</i>{0,1}</tt>, <tt><i>a</i>{0,}</tt>, i <tt><i>a</i>{1,}</tt>.</li><li>Nawiasy okrągłe <tt>()</tt> służą do grupowania wyrażeń przed <tt>?+*{</tt>.</li></ul></html> ++ ++ ++ ++ QDjViewFind::Model ++ ++ ++ 1 hit ++ 1 wynik ++ ++ ++ ++ %n hits ++ ++ %n wynik ++ %n wyniki ++ %n wyników ++ ++ ++ ++ ++ Page %1 (1 hit) ++ Strona %1 (1 wynik) ++ ++ ++ ++ Page %1 (%n hits) ++ ++ Strona %1 (%n wynik) ++ Strona %1 (%n wyniki) ++ Strona %1 (%n wyników) ++ ++ ++ ++ ++ Searching page %1 (waiting for data.) ++ Przeszukiwanie strony %1 (oczekiwanie na dane.) ++ ++ ++ ++ Searching page %1. ++ Przeszukiwanie strony %1. ++ ++ ++ ++ No hits! ++ Brak wyników! ++ ++ ++ ++ <html>Document is not searchable. No page contains information about its textual content.</html> ++ <html>Dokument nie nadaje się do przeszukiwania. Żadna strona nie zawiera treści tekstowej.</html> ++ ++ ++ ++ <html>Invalid regular expression.</html> ++ <html>Niepoprawne wyrażenie regularne.</html> ++ ++ ++ ++ QDjViewImgExporter ++ ++ ++ %1 Image ++ JPG Image ++ %1 obraz ++ ++ ++ ++ %1 Files (*.%2) ++ JPG Files ++ %1 plików (*.%2) ++ ++ ++ ++ Cannot render page. ++ Nie można zwizualizować strony. ++ ++ ++ ++ Image format %1 not supported. ++ Format obrazu %1 nie jest obsługiwany. ++ ++ ++ ++ QDjViewInfoDialog ++ ++ ++ Dialog ++ Dialog ++ ++ ++ ++ &Document ++ &Dokument ++ ++ ++ ++ &File ++ &Plik ++ ++ ++ ++ File: ++ Plik: ++ ++ ++ ++ &View Page ++ &Pokaż stronę ++ ++ ++ ++ &Close ++ &Zamknij ++ ++ ++ ++ File # ++ Plik nr ++ ++ ++ ++ File Name ++ Nazwa pliku ++ ++ ++ ++ File Size ++ Rozmiar pliku ++ ++ ++ ++ File Type ++ Typ pliku ++ ++ ++ ++ Page # ++ Strona nr ++ ++ ++ ++ Page Title ++ Tytuł strony ++ ++ ++ ++ <html><b>Document information</b><br>This panel shows information about the document and its component files. Select a component file to display detailed information in the <tt>File</tt> tab. Double click a component file to show the corresponding page in the main window. </html> ++ <html><b>Informacje o dokumencie</b><br>Ten panel zawiera informacje o dokumencie i jego plikach składowych. Wybierz plik składowy, aby wyświetlić szczegółowe informacje w zakładce <tt>Plik</tt> Kliknij dwukrotnie na plik składowy, aby wyświetlić odpowiednią stronę w głównym oknie. </html> ++ ++ ++ ++ <html><b>File and page information</b><br>This panel shows the structure of the DjVu data corresponding to the component file or the page selected in the <tt>Document</tt> tab. The arrow buttons jump to the previous or next component file.</html> ++ <html><b>Informacje o pliku i stronie</b><br>Ten panel pokazuje strukturę danych DjVu odpowiadających plikowi składowemu lub stronie wybranej w zakładce <tt>Dokument</tt> . Klawisze strzałek przenoszą do poprzedniego lub następnego pliku składowego.</html> ++ ++ ++ ++ Waiting for data... ++ Oczekiwanie na dane... ++ ++ ++ ++ Page #%1 ++ Strona nr %1 ++ ++ ++ ++ Thumbnails ++ Miniaturki ++ ++ ++ ++ Shared annotations ++ Adnotacje wspólne ++ ++ ++ ++ Shared data ++ Dane wspólne ++ ++ ++ ++ File #%1 - ++ Plik nr %1 - ++ ++ ++ ++ Single DjVu page ++ Pojedyncza strona DjVu ++ ++ ++ ++ Bundled DjVu document ++ Scalony dokument DjVu ++ ++ ++ ++ Indirect DjVu document ++ Rozłożony dokument DjVu ++ ++ ++ ++ Obsolete bundled DjVu document ++ Przestarzały scalony dokument DjVu ++ ++ ++ ++ Obsolete indexed DjVu document ++ Przestarzały rozłożony dokument DjVu ++ ++ ++ ++ 1 file ++ 1 plik ++ ++ ++ ++ %n files ++ ++ %n plik ++ %n pliki ++ %n plików ++ ++ ++ ++ ++ 1 page ++ 1 strona ++ ++ ++ ++ %n pages ++ ++ %n strona ++ %n strony ++ %n stron ++ ++ ++ ++ ++ ++ n/a ++ nie stosuje się ++ ++ ++ ++ Page ++ Strona ++ ++ ++ ++ Thumbnails ++ Miniaturki ++ ++ ++ ++ Shared ++ Wspólne ++ ++ ++ ++ QDjViewMetaDialog ++ ++ ++ Dialog ++ Dialog ++ ++ ++ ++ &Document Metadata ++ Metadane &dokumentu ++ ++ ++ ++ &Page Metadata ++ Metadane &strony ++ ++ ++ ++ Page: ++ Strona: ++ ++ ++ ++ &View Page ++ &Pokaż stronę ++ ++ ++ ++ &Close ++ &Zamknij ++ ++ ++ ++ Ctrl+C ++ copy ++ Ctrl+C ++ ++ ++ ++ Key ++ Klawisz ++ ++ ++ ++ Value ++ Wartość ++ ++ ++ ++ <html><b>Document metadata</b><br>This panel displays metadata pertaining to the document, such as author, title, references, etc. This information can be saved into the document with program <tt>djvused</tt>: use the commands <tt>create-shared-ant</tt> and <tt>set-meta</tt>.</html> ++ <html><b>Metadane dokumentu</b><br>Ten panel pokazuje metadane dokumentu, takie jak autor, tytuł, bibliografię itp. Informacje takie mogą być zapisane w dokumencie za pomocą programu <tt>djvused</tt> i komend <tt>create-shared-ant</tt> oraz <tt>set-meta</tt>.</html> ++ ++ ++ ++ <html><b>Page metadata</b><br>This panel displays metadata pertaining to a specific page. Page specific metadata override document metadata. This information can be saved into the document with program <tt>djvused</tt>: use command <tt>select</tt> to select the page and command <tt>set-meta</tt> to specify the metadata entries.</html> ++ <html><b>Metadane strony</b><br>Ten panel pokazuje metadane dotyczące konkretnej strony. Są one ważniejsze od metadanych dokumentu. Ta informacja może być zapisana w dokumencie za pomocą programu <tt>djvused</tt> i komend: <tt>select</tt> w celu wybrania strony i <tt>set-meta</tt> do wstawienia pól metadanych.</html> ++ ++ ++ ++ QDjViewOutline ++ ++ ++ <html><b>Document outline.</b><br/> This panel display the document outline, or the page names when the outline is not available, Double-click any entry to jump to the selected page.</html> ++ <html><b>Zakładki dokumentu.</b><br/> Ten panel pokazuje zakładki dokumentu, lub nazwy stron, jeśli zakładki nie są dostępny. Dwukrotne kliknięcie przenosi do wybranej strony.</html> ++ ++ ++ ++ Outline data is corrupted ++ Dane zakładek są uszkodzone ++ ++ ++ ++ Pages ++ Strony ++ ++ ++ ++ ++ Page %1 ++ Strona %1 ++ ++ ++ ++ ++ Go: page %1. ++ Przejdź do strony %1. ++ ++ ++ ++ Go: %1 ++ Przejdź: %1 ++ ++ ++ ++ QDjViewPSExporter ++ ++ ++ PostScript ++ PostScript ++ ++ ++ ++ ++ PostScript Files (*.ps *.eps) ++ Pliki w formacie PostScript (*.ps *.eps) ++ ++ ++ ++ Encapsulated PostScript ++ Encapsulated PostScript ++ ++ ++ ++ PostScript ++ tab caption ++ PostScript ++ ++ ++ ++ Position ++ tab caption ++ Pozycjonowanie ++ ++ ++ ++ Booklet ++ tab caption ++ Broszura ++ ++ ++ ++ <html><b>PostScript options.</b><br>Option <tt>Color</tt> enables color printing. Document pages can be decorated with frame and crop marks. PostScript language level 1 is only useful with very old printers. Level 2 works with most printers. Level 3 print color document faster on recent printers.</html> ++ <html><b>Opcje języka PostScript.</b><br>Opcje <tt>Kolor</tt> włącza drukowanie w kolorze. Strony dokumentu mogą być uzupełnione o ramki i znaczniki cięcia. Język PostScript poziom 1 jest przydatny tylko dla bardzo starych drukarek. Poziom 2 jest właściwy dla większości drukarek. Poziom 3 drukuje kolorowe dokumenty szybciej na nowszych drukarkach.</html> ++ ++ ++ ++ <html><b>Position and scaling.</b><br>Option <tt>Scale to fit</tt> accommodates whatever paper size your printer uses. Zoom factor <tt>100%</tt> reproduces the initial document size. Orientation <tt>Automatic</tt> chooses portrait or landscape on a page per page basis.</html> ++ <html><b>Pozycjonowanie i skalowanie.</b><br>Opcje <tt>Skaluj, aby dopasować</tt> dostosowuje się do dowolnego rozmiaru papieru. Współczynnik skalowania <tt>100%</tt> zachowuje oryginalny rozmiar dokumentu. Orientacja<tt>Automatyczne</tt> wybiera portret lub krajobraz osobno dla każdej strony.</html> ++ ++ ++ ++ <html><b>Producing booklets.</b><br>The booklet mode prints the selected pages as sheets suitable for folding one or several booklets. Several booklets might be produced when a maximum number of sheets per booklet is specified. You can either use a duplex printer or print rectos and versos separately.<p> Shifting rectos and versos is useful with poorly aligned duplex printers. The center margins determine how much space is left between the pages to fold the sheets. This space slowly increases from the inner sheet to the outer sheet.</html> ++ Loose translation ++ <html><b>Tworzenie broszury.</b><br>Tryb broszury drukuje wybrane strony jako arkusze nadające się do złożenia i utworzenia jednej lub więcej broszur. Kilka broszur można tworzyć kiedy jest określona maksymalna liczba arkuszy na broszurę. Można drukować dwustronnie lub osobno strony recto i strony verso.<p> Przesunięcie stron recto i verso jest przydatny dla drukarek dwustronnych, które nie wyrównują dobrze marginesów. Margines centralny decyduje o tym, ile miejsca jest między stronami na zgięcie arkusza. Ten margines zwiększa się powoli od arkuszy wewnętrznych do arkuszy zewnętrznych.</html> ++ ++ ++ ++ Save job creation failed! ++ Utworzenie zadania zapisania nie powiodło się! ++ ++ ++ ++ QDjViewPdfExporter ++ ++ ++ PDF Document ++ Dokument PDF ++ ++ ++ ++ PDF Files (*.pdf) ++ Pliki PDF (*.pdf) ++ ++ ++ ++ PDF Options ++ tab caption ++ Opcje PDF ++ ++ ++ ++ <html><b>PDF options.</b><br>These options control the characteristics of the images embedded in the exported PDF files. The resolution box limits their maximal resolution. Forcing bitonal G4 compression encodes all pages in black and white using the CCITT Group 4 compression. Allowing JPEG compression uses lossy JPEG for all non bitonal or subsampled images. Otherwise, allowing deflate compression produces more compact files. </html> ++ <html><b>Opcje PDF.</b><br>Te opcje określają własności obrazów zawartych w eksportowanych plikach PDF. Okienko rozdzielczości ogranicza ich maksymalną rozdzielczość. Wymuszenie bitonalnej kompresji oznacza zakodowanie wszystkich stron jako czarno-białych za pomocą kompresji CCITT Group 4. Dopuszczenie kompresji JPEG oznacza użycie stratnej kompresji JPEG dla wszystkich bitonalnych lub podpróbkowanych obrazów. W przeciwnym razie dopuszczenie kompresji deflate tworzy bardziej zwarte pliki. </html> ++ ++ ++ ++ Error while creating pdf file. ++ Błąd w trakcie tworzenia pliku PDF. ++ ++ ++ ++ Unable to create output file. ++ Nie można utworzyć pliku wyjściowego. ++ ++ ++ ++ ++ System error: %1. ++ Błąd systemowy: %1. ++ ++ ++ ++ Unable to reopen temporary file. ++ Nie można ponownie otworzyć pliku tymczasowego. ++ ++ ++ ++ PDF export was not compiled. ++ What it is supposed to mean? ++ Eksport do PDF nie został skompilowany. ++ ++ ++ ++ Unable to create temporary file. ++ Nie można utworzyć pliku tymczasowego. ++ ++ ++ ++ QDjViewPlugin::Document ++ ++ ++ Requesting %1. ++ Zażądano %1. ++ ++ ++ ++ QDjViewPrefsDialog ++ ++ ++ Dialog ++ Dialog ++ ++ ++ ++ &Screen ++ &Ekran ++ ++ ++ ++ Gamma ++ Współczynnik gamma ++ ++ ++ ++ <html>Screen color correction.<br>Adjust slider until gray shades look similar.</html> ++ <html>Korekta koloru ekranu.<br>Ustaw suwak tak, aby odcienie szarości były podobne.</html> ++ ++ ++ ++ Darker ++ Ciemniej ++ ++ ++ ++ Lighter ++ Jaśniej ++ ++ ++ ++ ++ Display ++ Wyświetlanie ++ ++ ++ ++ Force screen &resolution ++ Wymuś rozdzielczość &ekranową ++ ++ ++ ++ dpi ++ dpi ++ ++ ++ ++ Force inverted luminance ++ Wymuś odwrócenie luminancji ++ ++ ++ ++ &Interface ++ &Interfejs ++ ++ ++ ++ Options for ++ Obsolete? ++ Opcje dla ++ ++ ++ ++ &Remember initial state from last invocation ++ Loose translation ++ &Pamiętaj stan po ostatnim uruchomieniu ++ ++ ++ ++ Show ++ Wyświetlaj ++ ++ ++ ++ &Menu bar ++ Pasek &menu ++ ++ ++ ++ &Tool bar ++ Pasek &narzędzi ++ ++ ++ ++ Sc&rollbars ++ &Suwaki przewijania ++ ++ ++ ++ Stat&us bar ++ Pasek s&tanu ++ ++ ++ ++ &Side bar ++ Panel &boczny ++ ++ ++ ++ &Zoom: ++ Skalowanie too long ++ S&kala: ++ ++ ++ ++ Timer: ++ All reasonable translation too long ++ Timer: ++ ++ ++ ++ s ++ s ++ ++ ++ ++ Display page &frames ++ &Ramki stron ++ ++ ++ ++ Display &annotations ++ &Adnotacje ++ ++ ++ ++ Layout ++ Układ ++ ++ ++ ++ Continuous ++ Ciągły ++ ++ ++ ++ Side-by-side ++ Obok siebie ++ ++ ++ ++ Cover Page ++ Strona tytułowa ++ ++ ++ ++ Right-to-Left ++ Od prawej ++ ++ ++ ++ &Keys ++ &Klawisze ++ ++ ++ ++ Keys ++ Klawisze ++ ++ ++ ++ For displaying hyper&links: ++ Wyświetlanie &hiperłączy: ++ ++ ++ ++ For &selecting text or images: ++ &Zaznaczanie tekstu lub obrazów: ++ ++ ++ ++ For displaying the &lens: ++ Wyświetlanie &lupy: ++ ++ ++ ++ Mouse wheel ++ Rolka myszy ++ ++ ++ ++ Mouse wheel scrolls the page ++ Rolka myszy przewija stronę ++ ++ ++ ++ Mouse wheel changes the zoom factor ++ Rolka myszy zmienia wartość skalowania ++ ++ ++ ++ &Lens ++ &Lupa ++ ++ ++ ++ Enable magnifying &lens ++ Włącz szkło &powiększające ++ ++ ++ ++ Lens options ++ Opcje lupy ++ ++ ++ ++ Lens &size: ++ &Rozmiar okna lupy: ++ ++ ++ ++ Magnifying &power: ++ Stopień &powiększenia: ++ ++ ++ ++ x ++ x ++ ++ ++ ++ pixels ++ pikseli ++ ++ ++ ++ &Network ++ &Sieć ++ ++ ++ ++ Proxy settings ++ Ustawienia serwera pośredniczącego ++ ++ ++ ++ Use pro&xy to access the network ++ Stosuj &serwer pośredniczący ++ ++ ++ ++ &Host: ++ &Serwer: ++ ++ ++ ++ &Port: ++ &Port: ++ ++ ++ ++ &User: ++ &Użytkownik: ++ ++ ++ ++ Pass&word: ++ &Hasło: ++ ++ ++ ++ Cache ++ Pamięć podręczna ++ ++ ++ ++ &Clear ++ &Wyczyść ++ ++ ++ ++ ++ MB ++ MB ++ ++ ++ ++ &Decoded page cache: ++ Pamięć zdekodowanych &stron: ++ ++ ++ ++ &Pixel cache: ++ Pamięć &pikseli: ++ ++ ++ ++ &Advanced ++ &Zaawansowane ++ ++ ++ ++ Interface ++ Interfejs ++ ++ ++ ++ Force language (next time djview runs) ++ Wymuś język (wymaga ponownego uruchomienia) ++ ++ ++ ++ Enable page animations ++ Włącz animację stron ++ ++ ++ ++ Enable advanced features in menus ++ Włącz zaawansowane opcje w menu ++ ++ ++ ++ Show hidden text in status bar ++ Pokazuj na pasku stanu tekst ukryty ++ ++ ++ ++ Miscellaneous ++ Różne ++ ++ ++ ++ Render with openGL when available ++ Wizualizuj za pomocą openGL jeśli jest dostępne ++ ++ ++ ++ Override saving and printing restrictions ++ Ignoruj ograniczenia zapisywania i drukowania ++ ++ ++ ++ Manual printer color correction ++ Ręczna korekta kolorów drukowania ++ ++ ++ ++ gamma= ++ gamma= ++ ++ ++ ++ &Defaults ++ &Wartości domyślne ++ ++ ++ ++ &Apply ++ &Zastosuj ++ ++ ++ ++ &Ok ++ &OK ++ ++ ++ ++ Cancel ++ Anuluj ++ ++ ++ ++ Preferences[*] - DjView ++ Ustawienia - DjView ++ ++ ++ ++ <html><b>Screen gamma correction.</b><br>The best color rendition is achieved by adjusting the gamma correction slider and choosing the position that makes the gray square as uniform as possible.<p><b>Screen resolution.</b><br>This option forces a particular resolution instead of using the unreliable resolution advertised by the operating system. Forcing the resolution to 100 dpi matches the behavior of the djvulibre command line tools.</html> ++ <html><b>Korekcja współczynnika gamma.</b><br> Najlepszą wizualizację kolorów osiąga się przez wybór takiej pozycji suwaka, w której szare kwadraty są najbardziej podobne.<p><b>Rozdzielczość ekranu.</b><br>Ta opcja wymusza konkretną rozdzielczość zamiast rozdzielczości proponowanej przez system operacyjny. Wymuszanie rozdzielczości 100 dpi jest zgodne z zachowaniem programów narzędziowych DjVuLibre.</html> ++ ++ ++ ++ <html><b>Initial interface setup.</b><br>DjView can run as a standalone viewer, as a full screen viewer, as a full page browser plugin, or as a plugin embedded inside a html page. For each case, check the <tt>Remember</tt> box to automatically save and restore the interface setup. Otherwise, specify an initial configuration.</html> ++ <html><b>Początkowe ustawienie interfejsu.</b><br>DjView może pracować jako samodzielna przeglądarka, jako przeglądarka pełnoekranowa, jako pełnoekranowa wtyczka do przeglądarki WWW, i jako wtyczka osadzona na stronie HTML. W każdym przypadku należy zaznaczyć pole wyboru <tt>Pamiętaj</tt> aby automatycznie zapisać i odtworzyć ustawienia interfejsu. W przeciwnym wypadku należy określić konfigurację początkową.</html> ++ ++ ++ ++ <html><b>Modifiers keys.</b><br>Define which combination of modifier keys will show the manifying lens, temporarily enable the selection mode, or highlight the hyperlinks.</html> ++ <html><b>Klawisze modyfikujące.</b><br>Określ, które kombinacje klawiszy wyświetlają lupę, tymczasowo włączają tryb zaznaczania lub uwydatniają hiperłącza.</html> ++ ++ ++ ++ <html><b>Magnifying lens.</b><br>The magnifying lens appears when you depress the modifier keys specified in tab <tt>Keys</tt>. This panel lets you choose the power and the size of the magnifying lens.</html> ++ <html><b>Szkło powiekszające.</b><br>Szkło powiększające ukazuje się po naciśnięciu klawisza modyfikującego określonego w zakładce <tt>Klawisze</tt>. Ten panel pozwala wybrać stopień powiększenia i rozmiar lupy.</html> ++ ++ ++ ++ <html><b>Advanced.</b><br>You can override the default interface language, disable the page animations, or enable additional menu entries that are useful for authoring DjVu files.You can also disable the printing or saving restrictions dictated by certain web sites. The manual color correction can be useful with old printers.</html> ++ <html><b>Zaawansowane.</b><br>Można zmienić domyślny język interfejsu, wyłączyć animację stron, włączyć dodatkowe pozycje menu.Można również wyłączyć ograniczenia drukowania lub zapisywania narzucane przez niektóre witryny internetowe. Ręczna korekta koloru drukowania może być przydatna dla starych drukarek.</html> ++ ++ ++ ++ <html><b>Network proxy settings.</b><br>These proxy settings are used when the standalone djview viewer accesses a djvu document through a http url. The djview plugin always uses the proxy settings of the web browser.<p><b>Cache settings.</b><br>The <i>pixel cache</i> stores image data located outside the visible area. This cache makes panning smoother. The <i>decoded page cache</i> contains partially decoded pages. It provides faster response times when navigating a multipage document or when returning to a previously viewed page. Clearing this cache might be useful to reflect a change in the page data without restarting the DjVu viewer.</html> ++ <html><b>Ustawienia serwera pośredniczącego.</b><br>Te ustawienia są wykorzystywane, gdy samodzielna przeglądarka pobiera dokument za pomocą protokołu HTTP. Wtyczka DjView zawsze używa ustawień przeglądarki internetowej.<p><b>Ustawienia pamięci podręcznej.</b><br><i>Pamięć pikseli</i> przechowuje informacje o fragmentach obrazu, które nie są aktualnie wyświetlane. Powoduje to bardziej płynne pozycjonowanie. <i>Pamięć zdekodowanych stron</i> zawiera częściowo zdekodowane strony. Zapewnia szybszy czas reakcji podczas nawigacji w wielostronicowym dokumencie oraz przy powrocie do poprzednio wyświetlanej strony. Wyczyszczenie pamięci może być pożyteczne dla uwzględnienia zmienionych dany strony bez ponownego uruchamiania programu.</html> ++ ++ ++ ++ Standalone Viewer ++ Samodzielna przeglądarka ++ ++ ++ ++ Standalone Viewer (Full Screen mode) ++ Samodzielna przeglądarka (tryb pełnoekranowy) ++ ++ ++ ++ Standalone Viewer (Slideshow mode) ++ Samodzielna przeglądarka (pokaz slajdów) ++ ++ ++ ++ Full Page Plugin ++ Wtyczka całostronicowa ++ ++ ++ ++ Embedded Plugin ++ Wtyczka osadzona ++ ++ ++ ++ QDjViewPrintDialog ++ ++ ++ Dialog ++ Dialog ++ ++ ++ ++ ++ Print ++ Drukuj ++ ++ ++ ++ &Document ++ &Dokument ++ ++ ++ ++ C&urrent page ++ &Bieżąca strona ++ ++ ++ ++ &Pages ++ &Strony ++ ++ ++ ++ to ++ do ++ ++ ++ ++ Destination ++ Urządzenie docelowe ++ ++ ++ ++ Print to file ++ Drukuj do pliku ++ ++ ++ ++ Printer name: ++ Nazwa drukarki: ++ ++ ++ ++ Choose ++ Wybierz ++ ++ ++ ++ &Defaults ++ &Wartości domyślne ++ ++ ++ ++ &Ok ++ &OK ++ ++ ++ ++ ++ &Cancel ++ &Anuluj ++ ++ ++ ++ Stop ++ Stop ++ ++ ++ ++ <html><b>Printing.</b><br/> You can print the whole document or a page range. Use the <tt>Choose</tt> button to select a print destination and specify printer options. Additional dialog tabs might appear to specify conversion options.</html> ++ <html><b>Drukowanie.</b><br/> Można drukować cały dokument lub pewien przedział stron. Użyj przycisku <tt>Wybierz</tt> aby wybrać urządzenie i określić opcje drukowania. Mogą pojawić się dodatkowe zakładki z opcjami konwersji.</html> ++ ++ ++ ++ (invalid printer) ++ (drukarka niedostępna) ++ ++ ++ ++ All files ++ save filter ++ Wszystkie pliki ++ ++ ++ ++ Print To File - DjView ++ dialog caption ++ Drukuj do pliku - Djview ++ ++ ++ ++ Question - DjView ++ dialog caption ++ Pytanie - DjView ++ ++ ++ ++ A file with this name already exists. ++Do you want to replace it? ++ Plik o tej nazwie już istnieje ++Czy go zastąpić? ++ ++ ++ ++ &Replace ++ &Zastąp ++ ++ ++ ++ This operation has failed. ++ Ta operacja nie powiodła się. ++ ++ ++ ++ This operation has been interrupted. ++ Ta operacja została przerwana. ++ ++ ++ ++ QDjViewPrnExporter ++ ++ ++ Printer data ++ Dane drukarki ++ ++ ++ ++ PRN Files (*.prn) ++ Pliki PRN (*.prn) ++ ++ ++ ++ Printing Options ++ tab caption ++ Opcje drukowania ++ ++ ++ ++ <html><b>Printing options.</b><br>Option <tt>Color</tt> enables color printing. Document pages can be decorated with a frame. Option <tt>Scale to fit</tt> accommodates whatever paper size your printer uses. Zoom factor <tt>100%</tt> reproduces the initial document size. Orientation <tt>Automatic</tt> chooses portrait or landscape on a page per page basis.</html> ++ <html><b>Opcje drukowania.</b><br>Opcja <tt>Kolor</tt> włącza drukowanie w kolorze. Strony dokumentu mogą być ujęte w ramki. Opcja <tt>Dopasuj do strony</tt> dostosowuje wydruk do dowolnego rozmiaru papieru w drukarce. Współczynnik skalowania równy <tt>100%</tt> zachowuje oryginalny rozmiar dokumentu. Orientacja<tt>Automatycznie/tt> wybiera orientację portret lub krajobraz osobno dla każdej strony.</html> ++ ++ ++ ++ Cannot render page %1. ++ Nie można zwizualizować strony %1. ++ ++ ++ ++ QDjViewSaveDialog ++ ++ ++ Dialog ++ Dialog ++ ++ ++ ++ Save ++ Zapisz ++ ++ ++ ++ &Document ++ &Dokument ++ ++ ++ ++ C&urrent page ++ &Bieżąca strona ++ ++ ++ ++ &Pages ++ &Strony ++ ++ ++ ++ to ++ do ++ ++ ++ ++ Destination ++ Plik wynikowy ++ ++ ++ ++ Format: ++ Format: ++ ++ ++ ++ Bundled DjVu Document ++ Scalony dokument DjVu ++ ++ ++ ++ Indirect DjVu Document ++ Rozłożony dokument DjVu ++ ++ ++ ++ &Ok ++ &OK ++ ++ ++ ++ ++ &Cancel ++ &Anuluj ++ ++ ++ ++ Stop ++ Stop ++ ++ ++ ++ <html><b>Saving.</b><br/> You can save the whole document or a page range. The bundled format creates a single file. The indirect format creates multiple files suitable for web serving.</html> ++ <html><b>Zapisywanie.</b><br/> Można zapisać cały dokument lub zakres stron. Format scalony tworzy jeden plik. Format rozłożony tworzy wiele plików wygodnych do udostępniania przez serwery internetowe.</html> ++ ++ ++ ++ Error - DjView ++ dialog caption ++ Błąd - DjView ++ ++ ++ ++ Overwriting the current file is not allowed! ++ Nie można zastąpić bieżącego pliku! ++ ++ ++ ++ Question - DjView ++ dialog caption ++ Pytanie - DjView ++ ++ ++ ++ A file with this name already exists. ++Do you want to replace it? ++ Plik o tej nazwie już istnieje ++Czy go zastąpić? ++ ++ ++ ++ &Replace ++ &Zastąp ++ ++ ++ ++ This operation has failed. ++ Ta operacja nie powiodła się. ++ ++ ++ ++ This operation has been interrupted. ++ Ta operacja została przerwana. ++ ++ ++ ++ All files ++ save filter ++ Wszystkie pliki ++ ++ ++ ++ Save - DjView ++ dialog caption ++ Zapisz - DjView ++ ++ ++ ++ QDjViewThumbnails ++ ++ ++ Tiny ++ thumbnail menu ++ Malutkie ++ ++ ++ ++ Small ++ thumbnail menu ++ Małe ++ ++ ++ ++ Medium ++ thumbnail menu ++ Średnie ++ ++ ++ ++ Large ++ thumbnail menu ++ Duże ++ ++ ++ ++ Smart ++ thumbnail menu ++ Sprytne ++ ++ ++ ++ Control Left Mouse Button ++ Control i lewy klawisz myszy ++ ++ ++ ++ Right Mouse Button ++ Prawy klawisz myszy ++ ++ ++ ++ <html><b>Document thumbnails.</b><br/> This panel display thumbnails for the document pages. Double click a thumbnail to jump to the selected page. %1 to change the thumbnail size or the refresh mode. The smart refresh mode only computes thumbnails when the page data is present (displayed or cached.)</html> ++ <html><b>Miniaturki.</b><br/> Ten panel wyświetla miniaturki stron dokumentu. Podwójne kliknięcie na miniaturkę przenosi do odpowiedniej strony. %1 aby zmienić rozmiar miniaturek lub je odświeżyć. Tryb sprytny wyświetla miniaturkę tylko wtedy, gdy strona jest wyświetlana lub znajduje się w pamięci podręcznej.</html> ++ ++ ++ ++ QDjViewTiffExporter ++ ++ ++ TIFF Document ++ Dokument TIFF ++ ++ ++ ++ TIFF Files (*.tiff *.tif) ++ Pliki TIFF (*.tiff *.tif) ++ ++ ++ ++ TIFF Options ++ tab caption ++ Opcje TIFF ++ ++ ++ ++ <html><b>TIFF options.</b><br>The resolution box specifies an upper limit for the resolution of the TIFF images. Forcing bitonal G4 compression encodes all pages in black and white using the CCITT Group 4 compression. Allowing JPEG compression uses lossy JPEG for all non bitonal or subsampled images. Otherwise, allowing deflate compression produces more compact (but less portable) files than the default packbits compression.</html> ++ <html><b>Opcje TIFF </b><br>Pole wyboru rozdzielczości określa maksymalną rozdzielczość obrazów TIFF. Wymuszenie bitonalnej kompresji oznacza zakodowanie wszystkich stron jako czarno-białych za pomocą kompresji CCITT Group 4. Dopuszczenie kompresji JPEG oznacza użycie stratnej kompresji JPEG dla wszystkich bitonalnych lub podpróbkowanych obrazów. W przeciwnym razie dopuszczenie kompresji deflate tworzy bardziej zwarte pliki niż domyślna kompresja packbits.</html> ++ ++ ++ ++ Cannot open output file. ++ Nie można otworzyć pliku wyjściowego. ++ ++ ++ ++ Out of memory. ++ Zabrakło pamięci. ++ ++ ++ ++ Internal error. ++ Błąd wewnętrzny. ++ ++ ++ ++ TIFF export has not been compiled. ++ Eksport do TIFF nie został skompilowany. ++ ++ ++ ++ QDjVuNetDocument ++ ++ ++ Requesting '%1' ++ Zażądano %1 ++ ++ ++ ++ QDjVuNetDocument::Private ++ ++ ++ Received http status %1 while retrieving %2. ++ %1 is an http status code ++ Otrzymano kod statusu %1 podczas pobierania %2. ++ ++ ++ ++ Received <%1> data while retrieving %2. ++ %1 is a mime type ++ Otrzymano typ danych <%1> w czasie pobierania %2. ++ ++ ++ ++ %1 while retrieving '%2'. ++ %1 w czasie pobierania %2. ++ ++ ++ ++ Cannot validate the certificate for server %1. ++ Nie można potwierdzić certyfikatu serwera %1. ++ ++ ++ ++ Authentication required for %1 (%2). ++ Autoryzacja wymagana dla %1 (%2). ++ ++ ++ ++ Authentication required for proxy %1. ++ Autoryzacja wymagana dla serwera pośredniczącego %1. ++ ++ ++ +--- djview4-4.12.orig/src/qdjviewexporters.cpp ++++ djview4-4.12/src/qdjviewexporters.cpp +@@ -405,9 +405,9 @@ QDjViewDjVuExporter::save(QString fname) + fromPage = qBound(0, fromPage, pagenum-1); + QByteArray pagespec; + if (fromPage == toPage && pagenum > 1) +- pagespec.append(QString("--pages=%1").arg(fromPage+1)); ++ pagespec.append(QString("--pages=%1").arg(fromPage+1).toLocal8Bit()); + else if (fromPage != 0 || toPage != pagenum - 1) +- pagespec.append(QString("--pages=%1-%2").arg(fromPage+1).arg(toPage+1)); ++ pagespec.append(QString("--pages=%1-%2").arg(fromPage+1).arg(toPage+1).toLocal8Bit()); + QByteArray namespec; + if (indirect) + namespec = "--indirect=" + fname.toUtf8(); +--- djview4-4.12.orig/src/qdjviewprefs.cpp ++++ djview4-4.12/src/qdjviewprefs.cpp +@@ -1021,7 +1021,7 @@ QDjViewPrefsDialog::loadLanguageComboBox + { + // supported languages + static const char *languages[] = { +- "cs","de","en","es","fr","it","ja","ru","uk", ++ "cs","de","en","es","fr","it","ja","pl","ru","uk", + "zh_CN","zh_TW",0 } ; + // get application + QComboBox *cb = d->ui.languageComboBox; +--- djview4-4.12.orig/src/qdjvuwidget.cpp ++++ djview4-4.12/src/qdjvuwidget.cpp +@@ -3669,7 +3669,7 @@ MapArea::paintPermanent(QPaintDevice *w, + QRect r = rect.adjusted(bw, bw, -bw, -bw); + QString s = miniexp_to_qstring(comment); + paint.setPen(foregroundColor); +- int flags = Qt::AlignCenter|Qt::AlignVCenter|Qt::TextWordWrap; ++ int flags = Qt::AlignVCenter|Qt::TextWordWrap; + QFont font = paint.font(); + // estimate font size + int size = (int)(z * 0.12); +@@ -3678,11 +3678,11 @@ MapArea::paintPermanent(QPaintDevice *w, + QRect br; + font.setPixelSize(size); + paint.setFont(font); +- paint.drawText(r,flags|Qt::TextDontPrint,s,&br); ++ paint.drawText(r,flags|Qt::AlignHCenter|Qt::TextDontPrint,s,&br); + if (r.contains(br)) + { + // found good font size +- paint.drawText(r,flags,s,0); ++ paint.drawText(r,flags|Qt::AlignLeft,s,0); + break; + } + size -= 1; diff --git a/graphics/feh/feh.SlackBuild b/graphics/feh/feh.SlackBuild index e0cb56abdb8..fd2e250cea4 100644 --- a/graphics/feh/feh.SlackBuild +++ b/graphics/feh/feh.SlackBuild @@ -82,6 +82,9 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + +sed -i '/netdb/a #include ' src/imlib.c +patch -p1 < $CWD/mkstemp.patch + CFLAGS="$SLKCFLAGS" \ make \ PREFIX=/usr \ diff --git a/graphics/feh/mkstemp.patch b/graphics/feh/mkstemp.patch new file mode 100644 index 00000000000..586c7d97037 --- /dev/null +++ b/graphics/feh/mkstemp.patch @@ -0,0 +1,16 @@ +diff -up feh-3.10.3/src/imlib.c.orig feh-3.10.3/src/imlib.c +--- feh-3.10.3/src/imlib.c.orig 2024-09-08 22:51:00.354957296 -0500 ++++ feh-3.10.3/src/imlib.c 2024-09-08 22:56:21.891617710 -0500 +@@ -880,11 +880,7 @@ static char *feh_http_load_image(char *u + + D(("sfn is %s\n", sfn)) + +-#ifdef HAVE_MKSTEMPS +- fd = mkstemps(sfn, strlen(basename) + 1); +-#else +- fd = mkstemp(sfn); +-#endif ++fd = mkstemp(sfn); + + if (fd != -1) { + sfp = fdopen(fd, "w+"); diff --git a/graphics/fontforge/fontforge.SlackBuild b/graphics/fontforge/fontforge.SlackBuild index 905f220e670..c7dac320c03 100644 --- a/graphics/fontforge/fontforge.SlackBuild +++ b/graphics/fontforge/fontforge.SlackBuild @@ -112,6 +112,8 @@ mv uthash-"$UTHASH" uthash chown -R root:root gnulib uthash chmod -R u+w,go+r-w,a-s gnulib uthash +patch -p1 < $CWD/gettext-0.22.patch + mkdir -p build cd build cmake \ diff --git a/graphics/fontforge/gettext-0.22.patch b/graphics/fontforge/gettext-0.22.patch new file mode 100644 index 00000000000..4ab36b7908c --- /dev/null +++ b/graphics/fontforge/gettext-0.22.patch @@ -0,0 +1,150 @@ +diff -Naur fontforge-20201107.orig/po/fr.po fontforge-20201107/po/fr.po +--- fontforge-20201107.orig/po/fr.po 2020-11-07 21:42:58.000000000 +0100 ++++ fontforge-20201107/po/fr.po 2023-06-20 19:49:55.755110000 +0200 +@@ -273,7 +273,7 @@ + msgid "Bad Reference" + msgstr "Référence incorrecte" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "You are attempting to paste a reference to %1$s into %2$s.\n" + "But %1$s does not exist in this font, nor can I find the original character " +@@ -297,7 +297,7 @@ + msgid "_No" + msgstr "_Non" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "You are attempting to paste a reference to %1$s into %2$s.\n" + "But %1$s does not exist in this font.\n" +@@ -320,7 +320,7 @@ + msgid "Duplicate Anchor" + msgstr "Ancre en double" + +-#, c-format ++#, fuzzy, c-format + msgid "There is already an anchor point named %1$.40s in %2$.40s." + msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40hs." + +@@ -491,7 +491,7 @@ + msgid "_Use It" + msgstr "_Utilisez la" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "This font is based on the charset %1$.20s-%2$.20s-%3$d, but the best I've " + "been able to find is %1$.20s-%2$.20s-%4$d.\n" +@@ -1239,7 +1239,7 @@ + msgid "_Revert" + msgstr "_Revenir" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "Font %1$.40s in file %2$.40s has been changed.\n" + "Reverting the file will lose those changes.\n" +@@ -4464,7 +4464,7 @@ + "Il n'y a pas d'entrée ForceBoldThreshold dans la fonte grasse, mais il y a " + "une entrée ForceBold dans la fonte %30s" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "The fonts %1$.30s and %2$.30s have a different number of glyphs or different " + "encodings" +@@ -4472,7 +4472,7 @@ + "Les fontes %1$.30s et %2$.30hs n'ont pas le même nombre de glyphes ou des " + "codages différents" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "The fonts %1$.30s and %2$.30s use different types of splines (one quadratic, " + "one cubic)" +@@ -4525,7 +4525,7 @@ + "Le glyphe %1$.30s de la fonte %2$.30s possède des contours orientés de " + "manière différente que ceux de %3$.30s" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "The glyph %1$.30s in font %2$.30s has a different number of references than " + "in %3$.30s" +@@ -4566,7 +4566,7 @@ + "pas à ceux de %4$.30s (nombre différent ou critères de recouvrement " + "différents)" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "The glyph %1$.30s in font %2$.30s has a different hint mask on its contours " + "than in %3$.30s" +@@ -8022,7 +8022,7 @@ + msgid "Not Found" + msgstr "Non trouvé" + +-#, c-format ++#, fuzzy, c-format + msgid "The outlines of glyph %2$.30s were not found in the font %1$.60s" + msgstr "" + "Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60hs" +@@ -10453,7 +10453,7 @@ + #. GT: $2 is the glyph's encoding + #. GT: $3 is the pixel size of the bitmap font + #. GT: $4 is the font name +-#, c-format ++#, fuzzy, c-format + msgid "%1$.80s at %2$d size %3$d from %4$.80s" + msgstr "%1$.80s (%2$d) taille %3$d de %4$.80hs" + +@@ -11982,7 +11982,7 @@ + #. GT: $2 is the glyph's encoding + #. GT: $3 is the font name + #. GT: $4 is the changed flag ('*' for the changed items) +-#, c-format ++#, fuzzy, c-format + msgid "%1$.80s at %2$d from %3$.90s%4$s" + msgstr "%1$.80s à %2$d de %3$.90hs%4$s" + +@@ -23087,7 +23087,7 @@ + msgid "Use Kerning Class?" + msgstr "Utiliser la classe de crénage ?" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "This kerning pair (%.20s and %.20s) is currently part of a kerning class " + "with a 0 offset for this combination. Would you like to alter this kerning " +diff -Naur fontforge-20201107.orig/po/it.po fontforge-20201107/po/it.po +--- fontforge-20201107.orig/po/it.po 2020-11-07 21:42:58.000000000 +0100 ++++ fontforge-20201107/po/it.po 2023-06-20 19:50:45.026110000 +0200 +@@ -497,7 +497,7 @@ + msgid "_Use It" + msgstr "_Utilizza la" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "This font is based on the charset %1$.20s-%2$.20s-%3$d, but the best I've " + "been able to find is %1$.20s-%2$.20s-%4$d.\n" +@@ -1190,7 +1190,7 @@ + msgid "_Revert" + msgstr "_Ripristina" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "Font %1$.40s in file %2$.40s has been changed.\n" + "Reverting the file will lose those changes.\n" +@@ -4228,7 +4228,7 @@ + "supported in a font with variations" + msgstr "" + +-#, c-format ++#, fuzzy, c-format + msgid "" + "The glyph %1$.30s has a different number of contours in font %2$.30s than in " + "%3$.30s" diff --git a/graphics/gimagereader/gimagereader.SlackBuild b/graphics/gimagereader/gimagereader.SlackBuild index 7ed1d2accb8..593c4bbf0dd 100644 --- a/graphics/gimagereader/gimagereader.SlackBuild +++ b/graphics/gimagereader/gimagereader.SlackBuild @@ -79,6 +79,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/remove_enchant-provider.patch + # Path where manual will be installed sed -i 's,"share/doc/gimagereader","doc/'$PRGNAM-$VERSION'",' CMakeLists.txt || exit 1 diff --git a/graphics/gimagereader/remove_enchant-provider.patch b/graphics/gimagereader/remove_enchant-provider.patch new file mode 100644 index 00000000000..14820d2f082 --- /dev/null +++ b/graphics/gimagereader/remove_enchant-provider.patch @@ -0,0 +1,68 @@ +From e72d657a408dc6b77c48c086feede31e08700b4c Mon Sep 17 00:00:00 2001 +From: Sandro Mani +Date: Fri, 14 Jun 2024 00:37:20 +0200 +Subject: [PATCH] Work around enchant_get_prefix_dir which is not available + anymore in recent enchant + +--- + gtk/src/Config.cc | 7 ------- + qt/src/Config.cc | 10 ++++++---- + 2 files changed, 6 insertions(+), 11 deletions(-) + +diff --git a/gtk/src/Config.cc b/gtk/src/Config.cc +index fcec9645..73a68893 100644 +--- a/gtk/src/Config.cc ++++ b/gtk/src/Config.cc +@@ -24,7 +24,6 @@ + #include "Utils.hh" + #include "OutputEditorText.hh" + +-#include + #define USE_STD_NAMESPACE + #include + #if TESSERACT_MAJOR_VERSION < 5 +@@ -214,13 +213,7 @@ void Config::openSpellingDir() { + + std::string Config::spellingLocation(Location location) { + if(location == SystemLocation) { +-#ifdef G_OS_WIN32 + std::string dataDir = Glib::build_filename(pkgDir, "share"); +-#else +- char* prefix = enchant_get_prefix_dir(); +- std::string dataDir = Glib::build_filename(prefix, "share"); +- free(prefix); +-#endif + #if HAVE_ENCHANT2 + if(Gio::File::create_for_path(Glib::build_filename(dataDir, "myspell"))->query_exists()) { + return Glib::build_filename(dataDir, "myspell"); +diff --git a/qt/src/Config.cc b/qt/src/Config.cc +index efc788e2..fb6d2e58 100644 +--- a/qt/src/Config.cc ++++ b/qt/src/Config.cc +@@ -25,10 +25,10 @@ + + #include + #include ++#include + #include + #include + #include +-#include + #define USE_STD_NAMESPACE + #include + #if TESSERACT_MAJOR_VERSION < 5 +@@ -200,9 +200,11 @@ QString Config::spellingLocation(Location location) { + #ifdef Q_OS_WIN + QDir dataDir = QDir(QString("%1/../share/").arg(QApplication::applicationDirPath())); + #else +- char* prefix = enchant_get_prefix_dir(); +- QDir dataDir(QDir(prefix).absoluteFilePath("share")); +- free(prefix); ++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) ++ QDir dataDir = QDir(QString("%1/share/").arg(QLibraryInfo::path(QLibraryInfo::PrefixPath))); ++#else ++ QDir dataDir = QDir(QString("%1/share/").arg(QLibraryInfo::location(QLibraryInfo::PrefixPath))); ++#endif + #endif + #if HAVE_ENCHANT2 + if(QDir(dataDir.absoluteFilePath("myspell")).exists()) { diff --git a/graphics/gmic/gmic.SlackBuild b/graphics/gmic/gmic.SlackBuild index ae724de7939..77905c5172f 100644 --- a/graphics/gmic/gmic.SlackBuild +++ b/graphics/gmic/gmic.SlackBuild @@ -26,9 +26,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gmic -VERSION=${VERSION:-2.9.4} -COMMUNITYVERSION=${COMMUNITYVERSION:-6e9a20ef40e1db99c9b761853ad493ee7439e1b7} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.1.6} +COMMUNITYSRC=GMIC +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -73,8 +73,8 @@ rm -rf $PRGNAM-community rm -rf $PRGNAM-qt tar xvf $CWD/$PRGNAM\_$VERSION.tar.gz --warning=no-unknown-keyword mv $PRGNAM-$VERSION $PRGNAM -unzip $CWD/$PRGNAM-community-$COMMUNITYVERSION.zip || unzip $CWD/$COMMUNITYVERSION -mv $PRGNAM-community-$COMMUNITYVERSION $PRGNAM-community +tar xvf $CWD/$COMMUNITYSRC-$VERSION.tar.gz +mv $PRGNAM-community-$COMMUNITYSRC-$VERSION $PRGNAM-community cd $PRGNAM chown -R root:root . find -L . \ @@ -92,23 +92,18 @@ sed -i -e "s|LIB = lib|LIB = lib$LIBDIRSUFFIX|g" \ sed -i -e "s|-Ofast|-O2 -fno-fast-math --std=c++11|g" \ gmic-qt/gmic_qt.pro || exit 1 -make -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS} OPT_CFLAGS="$SLKCFLAGS " +make -j1 -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS} OPT_CFLAGS="$SLKCFLAGS " cd gmic-qt qmake-qt5 GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on HOST=none -make +make -j1 qmake-qt5 GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on HOST=gimp -make +make -j1 qmake-qt5 GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on HOST=krita -make +make -j1 -cd ../zart -qmake-qt5 GMIC_PATH=../src GMIC_DYNAMIC_LINKING=off QMAKE_CXXFLAGS+=" -DOPENCV2_HEADERS" -make cd .. -make -C src install LIB=lib$LIBDIRSUFFIX DESTDIR="$PKG" USR="/usr" - -rmdir $PKG/usr/share || true +make -j1 -C src install LIB=lib$LIBDIRSUFFIX DESTDIR="$PKG" USR="/usr" 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 diff --git a/graphics/gmic/gmic.info b/graphics/gmic/gmic.info index 5f7b119ad63..34498e99e96 100644 --- a/graphics/gmic/gmic.info +++ b/graphics/gmic/gmic.info @@ -1,10 +1,10 @@ PRGNAM="gmic" -VERSION="2.9.4" +VERSION="3.1.6" HOMEPAGE="https://gmic.eu" -DOWNLOAD="https://gmic.eu/files/source/gmic_2.9.4.tar.gz \ - https://github.com/dtschump/gmic-community/archive/6e9a20ef40e1db99c9b761853ad493ee7439e1b7.zip" -MD5SUM="e0d396ab6406c9baeb4929c1dd6a0d6a \ - 75f88fa1423f253714e84905a05f37da" +DOWNLOAD="https://gmic.eu/files/source/gmic_3.1.6.tar.gz \ + https://github.com/GreycLab/gmic-community/archive/GMIC-3.1.6/GMIC-3.1.6.tar.gz" +MD5SUM="62101676ee2b83438c3fc57180be92c6 \ + 0a42c6b71ad667638f7199a01feca1d1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/gpicview/README b/graphics/gpicview/README index 535b23c691c..e99809f09d8 100644 --- a/graphics/gpicview/README +++ b/graphics/gpicview/README @@ -3,3 +3,7 @@ program is not aimed to be powerful or feature-rich. It's aimed to replace the default image viewer of current desktop systems. Fast-startup, low memory usage, and a simple user interface make it a good choice for default viewer. + +If you want to build this for gtk+3, pass to the script the switch + + GTK3=yes diff --git a/graphics/gpicview/gpicview.SlackBuild b/graphics/gpicview/gpicview.SlackBuild index cfbe30d77c1..fc7aa785439 100644 --- a/graphics/gpicview/gpicview.SlackBuild +++ b/graphics/gpicview/gpicview.SlackBuild @@ -6,7 +6,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gpicview -VERSION=${VERSION:-0.2.5} +VERSION=${VERSION:-20231013_95eef26} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -19,9 +19,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -45,6 +42,8 @@ else LIBDIRSUFFIX="" fi +WITHGTK3="" ; [ "${GTK3:-no}" = "yes" ] && WITHGTK3="yes" + set -e rm -rf $PKG @@ -60,6 +59,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +./autogen.sh || true + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -68,6 +69,8 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ + $WITHGTK3 \ + --disable-silent-rules \ --build=$ARCH-slackware-linux make diff --git a/graphics/gpicview/gpicview.info b/graphics/gpicview/gpicview.info index e9658aff3cf..16cd88a4362 100644 --- a/graphics/gpicview/gpicview.info +++ b/graphics/gpicview/gpicview.info @@ -1,8 +1,8 @@ PRGNAM="gpicview" -VERSION="0.2.5" +VERSION="20231013_95eef26" HOMEPAGE="http://lxde.sourceforge.net/gpicview/" -DOWNLOAD="http://downloads.sourceforge.net/lxde/gpicview-0.2.5.tar.xz" -MD5SUM="26be9b0c5a234f1afe7d83d02a4a33f4" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/gpicview-20231013_95eef26.tar.xz" +MD5SUM="aa843ddfe08e59d739873d8c76f4c26f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/graphviz/graphviz.SlackBuild b/graphics/graphviz/graphviz.SlackBuild index 02bf2a1befe..c53ee444ff2 100644 --- a/graphics/graphviz/graphviz.SlackBuild +++ b/graphics/graphviz/graphviz.SlackBuild @@ -35,7 +35,7 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -57,7 +57,7 @@ if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -msse2" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" @@ -93,6 +93,7 @@ LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ + --enable-php=no \ --disable-static \ --build=$ARCH-slackware-linux diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild index a4e37fb5043..866e10d85db 100644 --- a/graphics/inkscape/inkscape.SlackBuild +++ b/graphics/inkscape/inkscape.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=inkscape -VERSION=${VERSION:-1.3.2} -EXTRAVER=${EXTRAVER:-2023-11-25_091e20ef0f} +VERSION=${VERSION:-1.4} +EXTRAVER=${EXTRAVER:-2024-10-09_e7c3feb100} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -77,8 +77,11 @@ 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/poppler2410.patch +patch -p1 < $CWD/poppler_24_11.patch + # strip invalid tag -sed -i /url/d org.inkscape.Inkscape.appdata.xml.in +sed -i /url/d org.inkscape.Inkscape.appdata.xml.in || exit 1 # https://bugs.launchpad.net/inkscape/+bug/314381 # a couple of files have executable bits set, @@ -89,9 +92,7 @@ find . -name '*.h' | xargs chmod -x dos2unix -k -q share/extensions/*.py # Fix man page location: -sed -i CMakeScripts/Pod2man.cmake -e "s/SHARE_INSTALL/CMAKE_INSTALL_PREFIX/g" - -patch -p1 < $CWD/libxml2-2.12.patch +sed -i CMakeScripts/Pod2man.cmake -e "s/SHARE_INSTALL/CMAKE_INSTALL_PREFIX/g" || exit 1 mkdir -p build cd build diff --git a/graphics/inkscape/inkscape.info b/graphics/inkscape/inkscape.info index b3887b766d9..7b1c39a1e07 100644 --- a/graphics/inkscape/inkscape.info +++ b/graphics/inkscape/inkscape.info @@ -1,8 +1,8 @@ PRGNAM="inkscape" -VERSION="1.3.2" +VERSION="1.4" HOMEPAGE="http://www.inkscape.org/" -DOWNLOAD="https://inkscape.org/gallery/item/44615/inkscape-1.3.2.tar.xz" -MD5SUM="76ed1f4b13065e80de8b2d77b6427b83" +DOWNLOAD="https://media.inkscape.org/dl/resources/file/inkscape-1.4.tar.xz" +MD5SUM="a93f3a8eab82ef3d610f426bfe58e3df" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="GraphicsMagick gdl dos2unix libcdr python3-lxml python2-numpy potrace pstoedit scour 2geom" diff --git a/graphics/inkscape/poppler2410.patch b/graphics/inkscape/poppler2410.patch new file mode 100644 index 00000000000..596c6d6fc6b --- /dev/null +++ b/graphics/inkscape/poppler2410.patch @@ -0,0 +1,384 @@ +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index 97b2909218..623572efd9 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -817,7 +817,7 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) + _POPPLER_FREE(obj3); + if (_POPPLER_CALL_ARGS_DEREF(obj3, obj2.dictLookup, "G").isStream()) { + if (_POPPLER_CALL_ARGS_DEREF(obj4, obj3.streamGetDict()->lookup, "Group").isDict()) { +- GfxColorSpace *blendingColorSpace = nullptr; ++ _POPPLER_GFX_COLOR_SPACE_TYPE blendingColorSpace = nullptr; + GBool isolated = gFalse; + GBool knockout = gFalse; + if (!_POPPLER_CALL_ARGS_DEREF(obj5, obj4.dictLookup, "CS").isNull()) { +@@ -864,7 +864,7 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) + } + + void PdfParser::doSoftMask(Object *str, GBool alpha, +- GfxColorSpace *blendingColorSpace, ++ _POPPLER_GFX_COLOR_SPACE_TYPE _POPPLER_CONSTREF_2410 blendingColorSpace, + GBool isolated, GBool knockout, + Function *transferFunc, GfxColor *backdropColor) { + Dict *dict, *resDict; +@@ -928,7 +928,7 @@ void PdfParser::doSoftMask(Object *str, GBool alpha, + --formDepth; + + if (blendingColorSpace) { +- delete blendingColorSpace; ++ _POPPLER_DELETE_UNIQUE_2410(blendingColorSpace) + } + _POPPLER_FREE(obj1); + } +@@ -943,41 +943,28 @@ void PdfParser::opSetRenderingIntent(Object /*args*/[], int /*numArgs*/) + + /** + * Get a newly allocated color space instance by CS operation argument. +- * +- * Maintains a cache for named color spaces to avoid expensive re-parsing. + */ +-GfxColorSpace *PdfParser::lookupColorSpaceCopy(Object &arg) ++_POPPLER_GFX_COLOR_SPACE_TYPE PdfParser::lookupColorSpaceCopy(Object &arg) + { + assert(!arg.isNull()); +- GfxColorSpace *colorSpace = nullptr; + + if (char const *name = arg.isName() ? arg.getName() : nullptr) { +- auto const cache_name = std::to_string(formDepth) + "-" + name; +- if ((colorSpace = colorSpacesCache[cache_name].get())) { +- return colorSpace->copy(); +- } +- + Object obj = res->lookupColorSpace(name); + if (obj.isNull()) { +- colorSpace = GfxColorSpace::parse(res, &arg, nullptr, state); ++ return GfxColorSpace::parse(res, &arg, nullptr, state); + } else { +- colorSpace = GfxColorSpace::parse(res, &obj, nullptr, state); +- } +- +- if (colorSpace && colorSpace->getMode() != csPattern) { +- colorSpacesCache[cache_name].reset(colorSpace->copy()); ++ return GfxColorSpace::parse(res, &obj, nullptr, state); + } + } else { + // We were passed in an object directly. +- colorSpace = GfxColorSpace::parse(res, &arg, nullptr, state); ++ return GfxColorSpace::parse(res, &arg, nullptr, state); + } +- return colorSpace; + } + + /** + * Look up pattern/gradients from the GfxResource dictionary + */ +-GfxPattern *PdfParser::lookupPattern(Object *obj, GfxState *state) ++_POPPLER_GFX_PATTERN_TYPE PdfParser::lookupPattern(Object *obj, GfxState *state) + { + if (!obj->isName()) + return nullptr; +@@ -990,7 +977,7 @@ void PdfParser::opSetFillGray(Object args[], int /*numArgs*/) + GfxColor color; + builder->beforeStateChange(state); + state->setFillPattern(nullptr); +- state->setFillColorSpace(new GfxDeviceGrayColorSpace()); ++ state->setFillColorSpace(_POPPLER_MAKE_GFX_COLOR_SPACE(new GfxDeviceGrayColorSpace())); + color.c[0] = dblToCol(args[0].getNum()); + state->setFillColor(&color); + builder->updateStyle(state); +@@ -1002,7 +989,7 @@ void PdfParser::opSetStrokeGray(Object args[], int /*numArgs*/) + GfxColor color; + builder->beforeStateChange(state); + state->setStrokePattern(nullptr); +- state->setStrokeColorSpace(new GfxDeviceGrayColorSpace()); ++ state->setStrokeColorSpace(_POPPLER_MAKE_GFX_COLOR_SPACE(new GfxDeviceGrayColorSpace())); + color.c[0] = dblToCol(args[0].getNum()); + state->setStrokeColor(&color); + builder->updateStyle(state); +@@ -1015,7 +1002,7 @@ void PdfParser::opSetFillCMYKColor(Object args[], int /*numArgs*/) + int i; + builder->beforeStateChange(state); + state->setFillPattern(nullptr); +- state->setFillColorSpace(new GfxDeviceCMYKColorSpace()); ++ state->setFillColorSpace(_POPPLER_MAKE_GFX_COLOR_SPACE(new GfxDeviceCMYKColorSpace())); + for (i = 0; i < 4; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } +@@ -1029,7 +1016,7 @@ void PdfParser::opSetStrokeCMYKColor(Object args[], int /*numArgs*/) + GfxColor color; + builder->beforeStateChange(state); + state->setStrokePattern(nullptr); +- state->setStrokeColorSpace(new GfxDeviceCMYKColorSpace()); ++ state->setStrokeColorSpace(_POPPLER_MAKE_GFX_COLOR_SPACE(new GfxDeviceCMYKColorSpace())); + for (int i = 0; i < 4; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } +@@ -1043,7 +1030,7 @@ void PdfParser::opSetFillRGBColor(Object args[], int /*numArgs*/) + GfxColor color; + builder->beforeStateChange(state); + state->setFillPattern(nullptr); +- state->setFillColorSpace(new GfxDeviceRGBColorSpace()); ++ state->setFillColorSpace(_POPPLER_MAKE_GFX_COLOR_SPACE(new GfxDeviceRGBColorSpace())); + for (int i = 0; i < 3; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } +@@ -1056,7 +1043,7 @@ void PdfParser::opSetStrokeRGBColor(Object args[], int /*numArgs*/) { + GfxColor color; + builder->beforeStateChange(state); + state->setStrokePattern(nullptr); +- state->setStrokeColorSpace(new GfxDeviceRGBColorSpace()); ++ state->setStrokeColorSpace(_POPPLER_MAKE_GFX_COLOR_SPACE(new GfxDeviceRGBColorSpace())); + for (int i = 0; i < 3; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } +@@ -1068,13 +1055,13 @@ void PdfParser::opSetStrokeRGBColor(Object args[], int /*numArgs*/) { + void PdfParser::opSetFillColorSpace(Object args[], int numArgs) + { + assert(numArgs >= 1); +- GfxColorSpace *colorSpace = lookupColorSpaceCopy(args[0]); ++ _POPPLER_GFX_COLOR_SPACE_TYPE colorSpace = lookupColorSpaceCopy(args[0]); + builder->beforeStateChange(state); + state->setFillPattern(nullptr); + + if (colorSpace) { + GfxColor color; +- state->setFillColorSpace(colorSpace); ++ state->setFillColorSpace(_POPPLER_COPY_UNIQUE_2410(colorSpace)); + colorSpace->getDefaultColor(&color); + state->setFillColor(&color); + builder->updateStyle(state); +@@ -1089,13 +1076,13 @@ void PdfParser::opSetStrokeColorSpace(Object args[], int numArgs) + assert(numArgs >= 1); + builder->beforeStateChange(state); + +- GfxColorSpace *colorSpace = lookupColorSpaceCopy(args[0]); ++ _POPPLER_GFX_COLOR_SPACE_TYPE colorSpace = lookupColorSpaceCopy(args[0]); + + state->setStrokePattern(nullptr); + + if (colorSpace) { + GfxColor color; +- state->setStrokeColorSpace(colorSpace); ++ state->setStrokeColorSpace(_POPPLER_COPY_UNIQUE_2410(colorSpace)); + colorSpace->getDefaultColor(&color); + state->setStrokeColor(&color); + builder->updateStyle(state); +@@ -1159,7 +1146,7 @@ void PdfParser::opSetFillColorN(Object args[], int numArgs) { + builder->updateStyle(state); + } + if (auto pattern = lookupPattern(&(args[numArgs - 1]), state)) { +- state->setFillPattern(pattern); ++ state->setFillPattern(_POPPLER_COPY_UNIQUE_2410(pattern)); + builder->updateStyle(state); + } + +@@ -1202,7 +1189,7 @@ void PdfParser::opSetStrokeColorN(Object args[], int numArgs) { + builder->updateStyle(state); + } + if (auto pattern = lookupPattern(&(args[numArgs - 1]), state)) { +- state->setStrokePattern(pattern); ++ state->setStrokePattern(_POPPLER_COPY_UNIQUE_2410(pattern)); + builder->updateStyle(state); + } + +@@ -1579,7 +1566,7 @@ void PdfParser::doShadingPatternFillFallback(GfxShadingPattern *sPat, + // TODO not good that numArgs is ignored but args[] is used: + void PdfParser::opShFill(Object args[], int /*numArgs*/) + { +- GfxShading *shading = nullptr; ++ _POPPLER_GFX_SHADING_TYPE shading = nullptr; + GfxPath *savedPath = nullptr; + bool savedState = false; + +@@ -1615,19 +1602,19 @@ void PdfParser::opShFill(Object args[], int /*numArgs*/) + // do shading type-specific operations + switch (shading->getType()) { + case 1: // Function-based shading +- doFunctionShFill(static_cast(shading)); ++ doFunctionShFill(static_cast(_POPPLER_GET_UNIQUE_2410(shading))); + break; + case 2: // Axial shading + case 3: // Radial shading +- builder->addClippedFill(shading, stateToAffine(state)); ++ builder->addClippedFill(_POPPLER_GET_UNIQUE_2410(shading), stateToAffine(state)); + break; + case 4: // Free-form Gouraud-shaded triangle mesh + case 5: // Lattice-form Gouraud-shaded triangle mesh +- doGouraudTriangleShFill(static_cast(shading)); ++ doGouraudTriangleShFill(static_cast(_POPPLER_GET_UNIQUE_2410(shading))); + break; + case 6: // Coons patch mesh + case 7: // Tensor-product patch mesh +- doPatchMeshShFill(static_cast(shading)); ++ doPatchMeshShFill(static_cast(_POPPLER_GET_UNIQUE_2410(shading))); + break; + } + +@@ -1637,7 +1624,7 @@ void PdfParser::opShFill(Object args[], int /*numArgs*/) + state->setPath(savedPath); + } + +- delete shading; ++ _POPPLER_DELETE_UNIQUE_2410(shading) + } + + void PdfParser::doFunctionShFill(GfxFunctionShading *shading) { +@@ -2528,7 +2515,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) + + } else { + // get color space and color map +- GfxColorSpace *colorSpace; ++ _POPPLER_GFX_COLOR_SPACE_TYPE colorSpace; + _POPPLER_CALL_ARGS(obj1, dict->lookup, "ColorSpace"); + if (obj1.isNull()) { + _POPPLER_FREE(obj1); +@@ -2537,11 +2524,11 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) + if (!obj1.isNull()) { + colorSpace = lookupColorSpaceCopy(obj1); + } else if (csMode == streamCSDeviceGray) { +- colorSpace = new GfxDeviceGrayColorSpace(); ++ colorSpace = _POPPLER_MAKE_GFX_COLOR_SPACE(new GfxDeviceGrayColorSpace()); + } else if (csMode == streamCSDeviceRGB) { +- colorSpace = new GfxDeviceRGBColorSpace(); ++ colorSpace = _POPPLER_MAKE_GFX_COLOR_SPACE(new GfxDeviceRGBColorSpace()); + } else if (csMode == streamCSDeviceCMYK) { +- colorSpace = new GfxDeviceCMYKColorSpace(); ++ colorSpace = _POPPLER_MAKE_GFX_COLOR_SPACE(new GfxDeviceCMYKColorSpace()); + } else { + colorSpace = nullptr; + } +@@ -2554,7 +2541,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) + _POPPLER_FREE(obj1); + _POPPLER_CALL_ARGS(obj1, dict->lookup, "D"); + } +- GfxImageColorMap *colorMap = new GfxImageColorMap(bits, &obj1, colorSpace); ++ GfxImageColorMap *colorMap = new GfxImageColorMap(bits, &obj1, _POPPLER_COPY_UNIQUE_2410(colorSpace)); + _POPPLER_FREE(obj1); + if (!colorMap->isOk()) { + delete colorMap; +@@ -2624,7 +2611,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) + _POPPLER_FREE(obj1); + _POPPLER_CALL_ARGS(obj1, maskDict->lookup, "CS"); + } +- GfxColorSpace *maskColorSpace = lookupColorSpaceCopy(obj1); ++ _POPPLER_GFX_COLOR_SPACE_TYPE maskColorSpace = lookupColorSpaceCopy(obj1); + _POPPLER_FREE(obj1); + if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { + goto err1; +@@ -2634,7 +2621,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) + _POPPLER_FREE(obj1); + _POPPLER_CALL_ARGS(obj1, maskDict->lookup, "D"); + } +- maskColorMap = new GfxImageColorMap(maskBits, &obj1, maskColorSpace); ++ maskColorMap = new GfxImageColorMap(maskBits, &obj1, _POPPLER_COPY_UNIQUE_2410(maskColorSpace)); + _POPPLER_FREE(obj1); + if (!maskColorMap->isOk()) { + delete maskColorMap; +@@ -2746,7 +2733,7 @@ void PdfParser::doForm(Object *str, double *offset) + { + Dict *dict; + GBool transpGroup, isolated, knockout; +- GfxColorSpace *blendingColorSpace; ++ _POPPLER_GFX_COLOR_SPACE_TYPE blendingColorSpace; + Object matrixObj, bboxObj; + double m[6], bbox[4]; + Object resObj; +@@ -2839,13 +2826,13 @@ void PdfParser::doForm(Object *str, double *offset) + --formDepth; + + if (blendingColorSpace) { +- delete blendingColorSpace; ++ _POPPLER_DELETE_UNIQUE_2410(blendingColorSpace) + } + _POPPLER_FREE(resObj); + } + + void PdfParser::doForm1(Object *str, Dict *resDict, double *matrix, double *bbox, GBool transpGroup, GBool softMask, +- GfxColorSpace *blendingColorSpace, GBool isolated, GBool knockout, GBool alpha, ++ _POPPLER_GFX_COLOR_SPACE_TYPE _POPPLER_CONSTREF_2410 blendingColorSpace, GBool isolated, GBool knockout, GBool alpha, + Function *transferFunc, GfxColor *backdropColor) + { + Parser *oldParser; +@@ -2854,7 +2841,7 @@ void PdfParser::doForm1(Object *str, Dict *resDict, double *matrix, double *bbox + pushResources(resDict); + + // Add a new container group before saving the state +- builder->startGroup(state, bbox, blendingColorSpace, isolated, knockout, softMask); ++ builder->startGroup(state, bbox, _POPPLER_GET_UNIQUE_2410(blendingColorSpace), isolated, knockout, softMask); + + // save current graphics state + saveState(); +diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h +index c7c10caefe..82254f9f41 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.h ++++ b/src/extension/internal/pdfinput/pdf-parser.h +@@ -137,7 +137,7 @@ public: + void loadPatternColorProfiles(Dict *resources); + void loadColorProfile(); + void loadColorSpaceProfile(GfxColorSpace *space, Object *obj); +- GfxPattern *lookupPattern(Object *obj, GfxState *state); ++ _POPPLER_GFX_PATTERN_TYPE lookupPattern(Object *obj, GfxState *state); + + std::shared_ptr getFontEngine(); + +@@ -173,10 +173,7 @@ private: + + OpHistoryEntry *operatorHistory; // list containing the last N operators + +- //! Caches color spaces by name +- std::map> colorSpacesCache; +- +- GfxColorSpace *lookupColorSpaceCopy(Object &); ++ _POPPLER_GFX_COLOR_SPACE_TYPE lookupColorSpaceCopy(Object &); + + void setDefaultApproximationPrecision(); // init color deltas + void pushOperator(const char *name); +@@ -202,7 +199,7 @@ private: + void opSetMiterLimit(Object args[], int numArgs); + void opSetLineWidth(Object args[], int numArgs); + void opSetExtGState(Object args[], int numArgs); +- void doSoftMask(Object *str, GBool alpha, GfxColorSpace *blendingColorSpace, GBool isolated, GBool knockout, ++ void doSoftMask(Object *str, GBool alpha, _POPPLER_GFX_COLOR_SPACE_TYPE _POPPLER_CONSTREF_2410 blendingColorSpace, GBool isolated, GBool knockout, + Function *transferFunc, GfxColor *backdropColor); + void opSetRenderingIntent(Object args[], int numArgs); + +@@ -296,7 +293,7 @@ private: + void doForm(Object *str, double *offset = nullptr); + void doForm1(Object *str, Dict *resDict, double *matrix, double *bbox, + GBool transpGroup = gFalse, GBool softMask = gFalse, +- GfxColorSpace *blendingColorSpace = nullptr, ++ _POPPLER_GFX_COLOR_SPACE_TYPE _POPPLER_CONSTREF_2410 blendingColorSpace = nullptr, + GBool isolated = gFalse, GBool knockout = gFalse, + GBool alpha = gFalse, Function *transferFunc = nullptr, + GfxColor *backdropColor = nullptr); +diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h +index 481aefadf4..97c0f807ee 100644 +--- a/src/extension/internal/pdfinput/poppler-transition-api.h ++++ b/src/extension/internal/pdfinput/poppler-transition-api.h +@@ -15,6 +15,27 @@ + #include + #include + ++#if POPPLER_CHECK_VERSION(24, 10, 0) ++#define _POPPLER_GFX_COLOR_SPACE_TYPE std::unique_ptr ++#define _POPPLER_GFX_PATTERN_TYPE std::unique_ptr ++#define _POPPLER_GFX_SHADING_TYPE std::unique_ptr ++#define _POPPLER_MAKE_GFX_COLOR_SPACE(ptr) std::unique_ptr(ptr) ++#define _POPPLER_DELETE_UNIQUE_2410(ptr) ++#define _POPPLER_COPY_UNIQUE_2410(ptr) ptr->copy() ++#define _POPPLER_GET_UNIQUE_2410(ptr) ptr.get() ++#define _POPPLER_CONSTREF_2410 const & ++#else ++#define _POPPLER_GFX_COLOR_SPACE_TYPE GfxColorSpace* ++#define _POPPLER_GFX_PATTERN_TYPE GfxPattern* ++#define _POPPLER_GFX_SHADING_TYPE GfxShading* ++#define _POPPLER_MAKE_GFX_COLOR_SPACE(ptr) ptr ++#define _POPPLER_DELETE_UNIQUE_2410(ptr) delete ptr; ++#define _POPPLER_COPY_UNIQUE_2410(ptr) ptr ++#define _POPPLER_GET_UNIQUE_2410(ptr) ptr ++#define _POPPLER_CONSTREF_2410 ++#endif ++ ++ + #if POPPLER_CHECK_VERSION(24, 5, 0) + #define _POPPLER_HAS_UNICODE_BOM(value) (hasUnicodeByteOrderMark(value->toStr())) + #define _POPPLER_HAS_UNICODE_BOMLE(value) (hasUnicodeByteOrderMarkLE(value->toStr())) diff --git a/graphics/inkscape/poppler_24_11.patch b/graphics/inkscape/poppler_24_11.patch new file mode 100644 index 00000000000..5108f0ce881 --- /dev/null +++ b/graphics/inkscape/poppler_24_11.patch @@ -0,0 +1,40 @@ +diff --git a/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp b/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp +index 34a8eed682..728b1d1aac 100644 +--- a/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp ++++ b/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp +@@ -419,9 +419,9 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li + FoFiTrueType *ff; + #endif + if (!font_data.empty()) { +- ff = FoFiTrueType::make((fontchar)font_data.data(), font_data.size()); ++ ff = FoFiTrueType::make((fontchar)font_data.data(), font_data.size(), 0); + } else { +- ff = FoFiTrueType::load(fileName.c_str()); ++ ff = FoFiTrueType::load(fileName.c_str(), 0); + } + if (!ff) { + goto err2; +@@ -444,9 +444,9 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li + FoFiTrueType *ff; + #endif + if (!font_data.empty()) { +- ff = FoFiTrueType::make((fontchar)font_data.data(), font_data.size()); ++ ff = FoFiTrueType::make((fontchar)font_data.data(), font_data.size(), 0); + } else { +- ff = FoFiTrueType::load(fileName.c_str()); ++ ff = FoFiTrueType::load(fileName.c_str(), 0); + } + if (!ff) { + error(errSyntaxError, -1, "failed to load truetype font\n"); +@@ -512,9 +512,9 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li + FoFiTrueType *ff; + #endif + if (!font_data.empty()) { +- ff = FoFiTrueType::make((fontchar)font_data.data(), font_data.size()); ++ ff = FoFiTrueType::make((fontchar)font_data.data(), font_data.size(), 0); + } else { +- ff = FoFiTrueType::load(fileName.c_str()); ++ ff = FoFiTrueType::load(fileName.c_str(), 0); + } + if (ff) { + if (ff->isOpenTypeCFF()) { diff --git a/graphics/kColorPicker/README b/graphics/kColorPicker/README deleted file mode 100644 index a0dc172eb6a..00000000000 --- a/graphics/kColorPicker/README +++ /dev/null @@ -1,5 +0,0 @@ -kColorPicker (Qt based Color Picker with popup menu) - -QToolButton with color popup menu which lets you select a color. -The popup features a color dialog button which can be used to -add custom colors to the popup menu. diff --git a/graphics/kColorPicker/kColorPicker.SlackBuild b/graphics/kColorPicker/kColorPicker.SlackBuild deleted file mode 100644 index 8736763cdc4..00000000000 --- a/graphics/kColorPicker/kColorPicker.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash -# -# Slackware build script for kColorPicker -# -# Copyright 2022 Alexander Schultz -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=kColorPicker -VERSION=${VERSION:-0.1.6} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -eu - -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_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DKCOV_INSTALL_MANDIR=/usr/man \ - -DKCOV_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ - -DBUILD_SHARED_LIBS=ON .. - make - make install/strip DESTDIR=$PKG -cd .. - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.md $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 diff --git a/graphics/kColorPicker/kColorPicker.info b/graphics/kColorPicker/kColorPicker.info deleted file mode 100644 index 2e6859a082f..00000000000 --- a/graphics/kColorPicker/kColorPicker.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="kColorPicker" -VERSION="0.1.6" -HOMEPAGE="https://github.com/ksnip/kColorPicker" -DOWNLOAD="https://github.com/ksnip/kColorPicker/archive/refs/tags/v0.1.6/kColorPicker-0.1.6.tar.gz" -MD5SUM="2a4e536cf7d947689d9a5e3cdef58837" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Alexander Schultz" -EMAIL="alexander_schultz@posteo.se" diff --git a/graphics/kColorPicker/slack-desc b/graphics/kColorPicker/slack-desc deleted file mode 100644 index c375029bab4..00000000000 --- a/graphics/kColorPicker/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------------------------------------------------------| -kColorPicker: kColorPicker (Qt based Color Picker with popup menu) -kColorPicker: -kColorPicker: QToolButton with color popup menu which lets you select a color. -kColorPicker: The popup features a color dialog button which can be used -kColorPicker: to add custom colors to the popup menu. -kColorPicker: -kColorPicker: Homepage: https://github.com/ksnip/kColorPicker -kColorPicker: -kColorPicker: -kColorPicker: -kColorPicker: diff --git a/graphics/kImageAnnotator/README b/graphics/kImageAnnotator/README deleted file mode 100644 index 535210789e1..00000000000 --- a/graphics/kImageAnnotator/README +++ /dev/null @@ -1,3 +0,0 @@ -kImageAnnotator (Tool for annotating images) - -Tool for annotating images. diff --git a/graphics/kImageAnnotator/kImageAnnotator.SlackBuild b/graphics/kImageAnnotator/kImageAnnotator.SlackBuild deleted file mode 100644 index a6ec4e9a459..00000000000 --- a/graphics/kImageAnnotator/kImageAnnotator.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash -# -# Slackware build script for kImageAnnotator -# -# Copyright 2022 Alexander Schultz -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=kImageAnnotator -VERSION=${VERSION:-0.5.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -eu - -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_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DKCOV_INSTALL_MANDIR=/usr/man \ - -DKCOV_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ - -DBUILD_SHARED_LIBS=ON .. - make - make install/strip DESTDIR=$PKG -cd .. - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.md $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 diff --git a/graphics/kImageAnnotator/kImageAnnotator.info b/graphics/kImageAnnotator/kImageAnnotator.info deleted file mode 100644 index caba0227ff8..00000000000 --- a/graphics/kImageAnnotator/kImageAnnotator.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="kImageAnnotator" -VERSION="0.5.3" -HOMEPAGE="https://github.com/ksnip/kImageAnnotator" -DOWNLOAD="https://github.com/ksnip/kImageAnnotator/archive/refs/tags/v0.5.3/kImageAnnotator-0.5.3.tar.gz" -MD5SUM="992390460ab4e10b967bed11f8558250" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="kColorPicker" -MAINTAINER="Alexander Schultz" -EMAIL="alexander_schultz@posteo.se" diff --git a/graphics/kImageAnnotator/slack-desc b/graphics/kImageAnnotator/slack-desc deleted file mode 100644 index 30f29d40bbb..00000000000 --- a/graphics/kImageAnnotator/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------------------------------------------------------| -kImageAnnotator: kImageAnnotator (Tool for annotating images) -kImageAnnotator: -kImageAnnotator: Tool for annotating images -kImageAnnotator: -kImageAnnotator: Homepage: https://github.com/ksnip/kImageAnnotator -kImageAnnotator: -kImageAnnotator: -kImageAnnotator: -kImageAnnotator: -kImageAnnotator: -kImageAnnotator: diff --git a/graphics/kuickshow/kuickshow.SlackBuild b/graphics/kuickshow/kuickshow.SlackBuild index d188793fb6a..91b3a1da986 100644 --- a/graphics/kuickshow/kuickshow.SlackBuild +++ b/graphics/kuickshow/kuickshow.SlackBuild @@ -78,6 +78,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# workaround for https://bugs.gentoo.org/919504 +sed -i "s|\${libImlib_CFLAGS}||" cmake/modules/FindIMLIB.cmake + mkdir -p build cd build cmake \ diff --git a/graphics/libplacebo/README b/graphics/libplacebo/README deleted file mode 100644 index eff104786cf..00000000000 --- a/graphics/libplacebo/README +++ /dev/null @@ -1,3 +0,0 @@ -libplacebo is essentially the core rendering algorithms and ideas of mpv -turned into a library. - diff --git a/graphics/libplacebo/libplacebo.SlackBuild b/graphics/libplacebo/libplacebo.SlackBuild deleted file mode 100644 index 3b776ba73b4..00000000000 --- a/graphics/libplacebo/libplacebo.SlackBuild +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/bash - -# Slackware build script for libplacebo - -# Copyright 2019-2020 Hunter Sezen California, USA -# Copyright 2023,24 Christoph Willing Sydney, Australia -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libplacebo -VERSION=${VERSION:-7.349.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -eu - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-v$VERSION -tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz -cd $PRGNAM-v$VERSION -patch -p0 < $CWD/use_meson-0.59.4.diff -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 {} \; - -if [ "${DEBUG:=0}" != 0 ]; then - NDEBUG=false - RELEASE=debug - SLKCFLAGS="$(printf %s "$SLKCFLAGS" | sed 's/-O2/-O0/')" -else - NDEBUG=true - RELEASE=plain -fi - -PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])') -export PYTHONPATH=/opt/python$PYVER/site-packages/ - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -meson \ - --prefix=/usr \ - --libdir=lib${LIBDIRSUFFIX} \ - -Dstrip=$NDEBUG \ - -Db_ndebug=$NDEBUG \ - -Dbuildtype=$RELEASE \ - -Ddemos=false \ - build - -"${NINJA:=ninja}" -C build -DESTDIR=$PKG "$NINJA" -C build install - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.md $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 diff --git a/graphics/libplacebo/libplacebo.info b/graphics/libplacebo/libplacebo.info deleted file mode 100644 index 977266995e0..00000000000 --- a/graphics/libplacebo/libplacebo.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libplacebo" -VERSION="7.349.0" -HOMEPAGE="https://code.videolan.org/videolan/libplacebo" -DOWNLOAD="https://code.videolan.org/videolan/libplacebo/-/archive/v7.349.0/libplacebo-v7.349.0.tar.gz" -MD5SUM="9b1d0d96793dfa883ed6ac70f7f871d1" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-meson-opt python3-glad" -MAINTAINER="Christoph Willing" -EMAIL="chris.willing@linux.com" diff --git a/graphics/libplacebo/slack-desc b/graphics/libplacebo/slack-desc deleted file mode 100644 index cdb54a92920..00000000000 --- a/graphics/libplacebo/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------------------------------------------------------| -libplacebo: libplacebo (GPU-accelerated video/image rendering primitives library) -libplacebo: -libplacebo: libplacebo is essentially the core rendering algorithms and ideas of -libplacebo: mpv turned into a library. -libplacebo: -libplacebo: Homepage: https://code.videolan.org/videolan/libplacebo -libplacebo: -libplacebo: -libplacebo: -libplacebo: -libplacebo: diff --git a/graphics/libplacebo/use_meson-0.59.4.diff b/graphics/libplacebo/use_meson-0.59.4.diff deleted file mode 100644 index 3c1c83ebde3..00000000000 --- a/graphics/libplacebo/use_meson-0.59.4.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- meson.build.orig 2023-03-24 00:53:00.000000000 +1000 -+++ meson.build 2023-08-23 10:52:45.189000000 +1000 -@@ -6,7 +6,7 @@ - 'c_std=c11', - 'cpp_std=c++11', - ], -- meson_version: '>=0.63', -+ meson_version: '>=0.59.4', - version: '@0@.@1@.@2@'.format( - # Major version - 5, diff --git a/graphics/luminance-hdr/luminance-hdr.SlackBuild b/graphics/luminance-hdr/luminance-hdr.SlackBuild index 027d2b07eae..85006e549b3 100644 --- a/graphics/luminance-hdr/luminance-hdr.SlackBuild +++ b/graphics/luminance-hdr/luminance-hdr.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=luminance-hdr -VERSION=${VERSION:-2.6.0} +VERSION=${VERSION:-2.6.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -80,10 +80,18 @@ 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 patches from gentoo +for i in $CWD/patches/* ; do patch -p1 < $i ; done + # Workround build failure with gcc-g++-4.9.3 and beyond (mangling bug?) # (fails to link libmvec: "undefined reference to `_ZGVbN4vv_powf'" etc) export CXX=clang++ +# Fix for boost >= 1.85.0 +sed -i \ + '/constants\/constants/i #include ' \ + src/Libpfs/manip/resize.hxx + # 20220320 bkw: for some reason, the -latomic is needed on 32-bit x86. # it does no harm on x86_64. mkdir -p build diff --git a/graphics/luminance-hdr/luminance-hdr.info b/graphics/luminance-hdr/luminance-hdr.info index cc84ef4b635..6151b431355 100644 --- a/graphics/luminance-hdr/luminance-hdr.info +++ b/graphics/luminance-hdr/luminance-hdr.info @@ -1,8 +1,8 @@ PRGNAM="luminance-hdr" -VERSION="2.6.0" +VERSION="2.6.1.1" HOMEPAGE="http://qtpfsgui.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/qtpfsgui/2.6.0/luminance-hdr-2.6.0.tar.bz2" -MD5SUM="9ac2be847d304f0ddc7089b251825c4d" +DOWNLOAD="http://downloads.sf.net/qtpfsgui/luminance-hdr-2.6.1.1.tar.bz2" +MD5SUM="c57baf1d3c5d7952f952496f20f86c8f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.5.1-openmp-automagic.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.5.1-openmp-automagic.patch new file mode 100644 index 00000000000..f0399d271a5 --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.5.1-openmp-automagic.patch @@ -0,0 +1,32 @@ +diff --git a/build_files/Modules/CompilerSettings.cmake b/build_files/Modules/CompilerSettings.cmake +index f55c130..81e1916 100644 +--- a/build_files/Modules/CompilerSettings.cmake ++++ b/build_files/Modules/CompilerSettings.cmake +@@ -45,16 +45,19 @@ else() + message(WARNING "Your C++ compiler does not support C++11.") + endif() + #OpenMP Support under Linux, Windows with MSVC & MacOS X with GCC >= 4.3 +-IF(MSVC) +- FIND_PACKAGE(OpenMP REQUIRED) +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") +-ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX) +- EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) +- IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) +- MESSAGE(STATUS "GCC >= 4.3") ++OPTION(USE_OPENMP "Use openmp threading support." ON) ++IF(USE_OPENMP) ++ IF(MSVC) + FIND_PACKAGE(OpenMP REQUIRED) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") ++ ELSEIF(CMAKE_COMPILER_IS_GNUCC AND UNIX) ++ EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) ++ IF(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) ++ MESSAGE(STATUS "GCC >= 4.3") ++ FIND_PACKAGE(OpenMP REQUIRED) ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") ++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") ++ ENDIF() + ENDIF() + ENDIF() diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-cmake.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-cmake.patch new file mode 100644 index 00000000000..5564ebadc95 --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-cmake.patch @@ -0,0 +1,22 @@ +--- a/CMakeLists.txt 2019-06-09 21:18:38.000000000 +0200 ++++ b/CMakeLists.txt 2019-09-15 23:53:19.496802424 +0200 +@@ -5,19 +5,6 @@ + CMAKE_POLICY(SET CMP0053 NEW) + PROJECT("Luminance HDR") + +-string(TOLOWER ${CMAKE_BUILD_TYPE} LOWERCASE_CMAKE_BUILD_TYPE) +-if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(debug|release|relwithdebinfo|minsizerel)$") +- message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") +-else() +- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}\n" +- "CMAKE_BUILD_TYPE should be one of:\nDebug, Release, RelWithDebInfo, MinSizeRel") +-endif() +- +-if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(release|minsizerel)$") +- message(STATUS "Adding definitions: -DQT_NO_DEBUG_OUTPUT") +- add_definitions("-DQT_NO_DEBUG_OUTPUT") +-endif() +- + # assume built-in pthreads on MacOS + IF(APPLE) + enable_language(CXX) diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-docs.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-docs.patch new file mode 100644 index 00000000000..982c7ebfac2 --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-docs.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt 2019-06-09 21:18:38.000000000 +0200 ++++ b/CMakeLists.txt 2019-09-15 23:43:41.005292354 +0200 +@@ -413,12 +413,6 @@ + INSTALL(FILES ${CMAKE_SOURCE_DIR}/program-icons/luminance-hdr.png DESTINATION share/icons/hicolor/48x48/apps) # icon + INSTALL(FILES ${CMAKE_SOURCE_DIR}/net.sourceforge.qtpfsgui.LuminanceHDR.desktop DESTINATION share/applications) #desktop entry + INSTALL(FILES ${CMAKE_SOURCE_DIR}/net.sourceforge.qtpfsgui.LuminanceHDR.appdata.xml DESTINATION share/appdata) #appstream +- INSTALL(FILES +- ${CMAKE_SOURCE_DIR}/AUTHORS +- ${CMAKE_SOURCE_DIR}/README.md +- ${CMAKE_SOURCE_DIR}/LICENSE +- ${CMAKE_SOURCE_DIR}/Changelog +- DESTINATION share/luminance-hdr/doc) #info files + INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/help DESTINATION share/luminance-hdr) # help directory + INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/hdrhtml DESTINATION share/luminance-hdr) # hdrhtml directory + # Microsoft Windows diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-no-git.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-no-git.patch new file mode 100644 index 00000000000..1d95930404d --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.6.0-no-git.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt 2019-06-09 21:18:38.000000000 +0200 ++++ b/CMakeLists.txt 2019-09-15 23:41:24.684413834 +0200 +@@ -103,11 +103,7 @@ + set(LIBS ${LIBS} ${QT_QTWEBKIT_LIBRARIES}) + endif() + +-FIND_PACKAGE(Git) +-IF(GIT_FOUND) +- include(GetGitRevisionDescription) +- get_git_head_revision(GIT_REFSPEC GIT_SHA1) +-ENDIF() ++SET(GIT_SHA1 "-- Slackware build --") + + IF(WIN32) + diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-exiv-0.28.x.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-exiv-0.28.x.patch new file mode 100644 index 00000000000..d5c1289e0a9 --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-exiv-0.28.x.patch @@ -0,0 +1,191 @@ +Description: Fix build with >=exiv2-0.28.0, raise minimum to 0.27.0 + - enables use of EXIV2_TEST_VERSION macro + - add compatibility for exiv2-0.28 +Author: Robert-André Mauchin +Origin: upstream, https://github.com/LuminanceHDR/LuminanceHDR/commit/e5ebd48fac2de33f4990f530c68dd4c9d8fc3829 +Last-Update: 2024-02-25 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -180,7 +180,7 @@ ENDIF() + FIND_PACKAGE(Boost REQUIRED COMPONENTS program_options thread chrono system date_time) + INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR}) + +-FIND_PACKAGE(Exiv2 REQUIRED) ++FIND_PACKAGE(Exiv2 REQUIRED 0.27.0) + INCLUDE_DIRECTORIES(${EXIV2_INCLUDE_DIR} "${EXIV2_INCLUDE_DIR}/exiv2") + + FIND_PACKAGE(TIFF REQUIRED) +--- a/src/Exif/ExifOperations.cpp ++++ b/src/Exif/ExifOperations.cpp +@@ -42,6 +42,14 @@ + #include "ExifOperations.h" + #include "arch/math.h" + ++#if EXIV2_TEST_VERSION(0,28,0) ++typedef Exiv2::Error Exiv2Error; ++typedef Exiv2::Image::UniquePtr ImagePtr; ++#else ++typedef Exiv2::AnyError Exiv2Error; ++typedef Exiv2::Image::AutoPtr ImagePtr; ++#endif ++ + using namespace boost; + using namespace boost::assign; + +@@ -108,7 +116,7 @@ void copyExifData(const std::string &fro + #endif + + try { +- Exiv2::Image::AutoPtr sourceImage; ++ ImagePtr sourceImage; + Exiv2::ExifData srcExifData; + + if (!from.empty()) { +@@ -128,7 +136,7 @@ void copyExifData(const std::string &fro + } + + // get destination exif data +- Exiv2::Image::AutoPtr destinationImage = Exiv2::ImageFactory::open(to); ++ ImagePtr destinationImage = Exiv2::ImageFactory::open(to); + + if (dontOverwrite) { + // doesn't throw anything if it is empty +@@ -212,7 +220,7 @@ void copyExifData(const std::string &fro + destinationImage->setExifData(srcExifData); + } + destinationImage->writeMetadata(); +- } catch (Exiv2::AnyError &e) { ++ } catch (Exiv2Error &e) { + #ifndef NDEBUG + qDebug() << e.what(); + #endif +@@ -250,7 +258,7 @@ float obtain_avg_lum(const std::string& + { + try + { +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename); ++ ImagePtr image = Exiv2::ImageFactory::open(filename); + image->readMetadata(); + Exiv2::ExifData &exifData = image->exifData(); + if (exifData.empty()) +@@ -329,7 +337,7 @@ allowed for ev computation purposes. + return -1; + } + } +- catch (Exiv2::AnyError& e) ++ catch (Exiv2Error& e) + { + return -1; + } +@@ -338,7 +346,7 @@ allowed for ev computation purposes. + + float getExposureTime(const std::string &filename) { + try { +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename); ++ ImagePtr image = Exiv2::ImageFactory::open(filename); + image->readMetadata(); + Exiv2::ExifData &exifData = image->exifData(); + if (exifData.empty()) return -1; +@@ -374,14 +382,14 @@ float getExposureTime(const std::string + } else { + return -1; + } +- } catch (Exiv2::AnyError &e) { ++ } catch (Exiv2Error &e) { + return -1; + } + } + + float getAverageLuminance(const std::string &filename) { + try { +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename); ++ ImagePtr image = Exiv2::ImageFactory::open(filename); + image->readMetadata(); + Exiv2::ExifData &exifData = image->exifData(); + +@@ -403,7 +411,7 @@ float getAverageLuminance(const std::str + << std::endl; + + return -1.0; +- } catch (Exiv2::AnyError &e) { ++ } catch (Exiv2Error &e) { + return -1.0; + } + } +--- a/src/Libpfs/exif/exifdata.cpp ++++ b/src/Libpfs/exif/exifdata.cpp +@@ -25,6 +25,16 @@ + #include + #include + ++#if EXIV2_TEST_VERSION(0,28,0) ++typedef Exiv2::Error Exiv2Error; ++typedef Exiv2::Image::UniquePtr ImagePtr; ++#define EXIV2_TO_INT toInt64 ++#else ++typedef Exiv2::AnyError Exiv2Error; ++typedef Exiv2::Image::AutoPtr ImagePtr; ++#define EXIV2_TO_INT toLong ++#endif ++ + namespace pfs { + namespace exif { + +@@ -52,7 +62,7 @@ ExifData::ExifData(const std::string &fi + void ExifData::fromFile(const std::string &filename) { + reset(); + try { +- ::Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename); ++ ::ImagePtr image = Exiv2::ImageFactory::open(filename); + image->readMetadata(); + ::Exiv2::ExifData &exifData = image->exifData(); + +@@ -121,7 +131,7 @@ void ExifData::fromFile(const std::strin + */ + if ((it = exifData.findKey(Exiv2::ExifKey("Exif.Image.Orientation"))) != + exifData.end()) { +- long rotation = it->toLong(); ++ long rotation = it->EXIV2_TO_INT(); + switch (rotation) { + case 3: + m_orientation = 180; +@@ -134,7 +144,7 @@ void ExifData::fromFile(const std::strin + break; + } + } +- } catch (Exiv2::AnyError &e) { ++ } catch (Exiv2Error &e) { + return; + } + } +--- a/src/TransplantExif/TransplantExifDialog.cpp ++++ b/src/TransplantExif/TransplantExifDialog.cpp +@@ -27,14 +27,11 @@ + #include + #include + #include +-// Make sure an EXIV2_TEST_VERSION macro exists: +-#ifdef EXIV2_VERSION +-# ifndef EXIV2_TEST_VERSION +-# define EXIV2_TEST_VERSION(major,minor,patch) \ +- ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) ) +-# endif ++ ++#if EXIV2_TEST_VERSION(0,28,0) ++typedef Exiv2::Error Exiv2Error; + #else +-# define EXIV2_TEST_VERSION(major,minor,patch) (false) ++typedef Exiv2::AnyError Exiv2Error; + #endif + + #include "Common/config.h" +@@ -347,7 +344,7 @@ void TransplantExifDialog::transplant_re + QFile::encodeName((*i_dest)).constData(), + m_Ui->checkBox_dont_overwrite->isChecked()); + m_Ui->rightlist->item(index)->setBackground(QBrush("#a0ff87")); +- } catch (Exiv2::AnyError &e) { ++ } catch (Exiv2Error &e) { + add_log_message("ERROR:" + QString::fromStdString(e.what())); + m_Ui->rightlist->item(index)->setBackground(QBrush("#ff743d")); + } diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-fixheaders.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-fixheaders.patch new file mode 100644 index 00000000000..58974ea998e --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-fixheaders.patch @@ -0,0 +1,15 @@ +Source: arch linux + +diff --git a/src/Common/init_fftw.h b/src/Common/init_fftw.h +index af2fc02c..a4aad47f 100644 +--- a/src/Common/init_fftw.h ++++ b/src/Common/init_fftw.h +@@ -22,7 +22,7 @@ + #ifndef INIT_FFTW_H + #define INIT_FFTW_H + +-#include ++#include + + class FFTW_MUTEX { + public: diff --git a/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-openexr3.patch b/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-openexr3.patch new file mode 100644 index 00000000000..9ab28329870 --- /dev/null +++ b/graphics/luminance-hdr/patches/luminance-hdr-2.6.1.1-openexr3.patch @@ -0,0 +1,28 @@ +Source: arch linux + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8ff498d0..23f5c387 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -191,7 +191,7 @@ INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) + FIND_PACKAGE(PNG REQUIRED) + INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) + +-FIND_PACKAGE(OpenEXR REQUIRED) ++FIND_PACKAGE(OpenEXR CONFIG REQUIRED) + INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_DIR} "${OPENEXR_INCLUDE_DIR}/OpenEXR") + + FIND_PACKAGE(GSL REQUIRED) +diff --git a/src/Libpfs/CMakeLists.txt b/src/Libpfs/CMakeLists.txt +index 80617998..ce3c746e 100644 +--- a/src/Libpfs/CMakeLists.txt ++++ b/src/Libpfs/CMakeLists.txt +@@ -12,7 +12,7 @@ ADD_SUBDIRECTORY(colorspace) + ADD_SUBDIRECTORY(io) + + ADD_LIBRARY(pfs STATIC ${LIBPFS_H} ${LIBPFS_HXX} ${LIBPFS_CPP}) +-TARGET_LINK_LIBRARIES(pfs Qt5::Core Qt5::Gui Qt5::Widgets) ++TARGET_LINK_LIBRARIES(pfs Qt5::Core Qt5::Gui Qt5::Widgets OpenEXR::OpenEXR) + + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} pfs PARENT_SCOPE) + SET(LUMINANCE_MODULES_CLI ${LUMINANCE_MODULES_CLI} pfs PARENT_SCOPE) diff --git a/graphics/openimageio/openimageio.SlackBuild b/graphics/openimageio/openimageio.SlackBuild index 5be9a3d6928..97f6b7adaad 100644 --- a/graphics/openimageio/openimageio.SlackBuild +++ b/graphics/openimageio/openimageio.SlackBuild @@ -90,6 +90,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/std_filesystem.patch + mkdir -p build cd build cmake ../ \ diff --git a/graphics/openimageio/std_filesystem.patch b/graphics/openimageio/std_filesystem.patch new file mode 100644 index 00000000000..02bd5dc2a3d --- /dev/null +++ b/graphics/openimageio/std_filesystem.patch @@ -0,0 +1,20 @@ +--- ./src/libutil/filesystem.cpp 2022-07-02 00:43:12.000000000 +0200 ++++ ./src/libutil/filesystem.cpp.fix 2024-06-15 19:20:43.444592937 +0200 +@@ -227,7 +227,7 @@ + const filesystem::path d(u8path(d_utf8)); + filesystem::path f = d / filename; + error_code ec; +- if (filesystem::is_regular(f, ec)) { ++ if (filesystem::is_regular_file(f, ec)) { + return pathstr(f); + } + +@@ -922,7 +922,7 @@ + !ec && it != end_it; ++it) { + std::string itpath = Filesystem::generic_filepath( + it->path().string()); +- if (filesystem::is_regular(itpath, ec)) { ++ if (filesystem::is_regular_file(itpath, ec)) { + const std::string f = pathstr(itpath); + match_results frame_match; + if (regex_match(f, frame_match, pattern_re)) { diff --git a/graphics/rawtherapee/jpeg_turbo_3.0.3.patch b/graphics/rawtherapee/jpeg_turbo_3.0.3.patch new file mode 100644 index 00000000000..4dd964860d3 --- /dev/null +++ b/graphics/rawtherapee/jpeg_turbo_3.0.3.patch @@ -0,0 +1,89 @@ +From efdc5bce3b9794847093baeb040937ab55eba86e Mon Sep 17 00:00:00 2001 +From: Richard E Barber +Date: Sun, 19 May 2024 04:27:10 -0700 +Subject: [PATCH 1/2] Fix linking with jpeg-turbo + +patch via Termux PR +https://github.com/termux-user-repository/tur/pull/1027 +--- + rtengine/jdatasrc.cc | 28 ++-------------------------- + 1 file changed, 2 insertions(+), 26 deletions(-) + +diff --git a/rtengine/jdatasrc.cc b/rtengine/jdatasrc.cc +index fa13b9dd13..a0d12657f2 100644 +--- a/rtengine/jdatasrc.cc ++++ b/rtengine/jdatasrc.cc +@@ -247,20 +247,6 @@ my_error_exit (j_common_ptr cinfo) + #endif + } + +- +-#ifdef _WIN32 +-#define JVERSION "6b 27-Mar-1998" +-#define JCOPYRIGHT_SHORT "(C) 1998, Thomas G. Lane" +-#define JMESSAGE(code,string) string , +- +-const char * const jpeg_std_message_table[] = { +-#include "jerror.h" +- NULL +-}; +-#else +-extern const char * const jpeg_std_message_table[]; +-#endif +- + /* + * Actual output of an error or trace message. + * Applications may override this method to send JPEG messages somewhere +@@ -409,24 +395,14 @@ reset_error_mgr (j_common_ptr cinfo) + GLOBAL(struct jpeg_error_mgr *) + my_jpeg_std_error (struct jpeg_error_mgr * err) + { ++ err = jpeg_std_error(err); + ++ /* override these functions */ + err->error_exit = my_error_exit; + err->emit_message = emit_message; + err->output_message = output_message; + err->format_message = format_message; + err->reset_error_mgr = reset_error_mgr; + +- err->trace_level = 0; /* default = no tracing */ +- err->num_warnings = 0; /* no warnings emitted yet */ +- err->msg_code = 0; /* may be useful as a flag for "no error" */ +- +- /* Initialize message table pointers */ +- err->jpeg_message_table = jpeg_std_message_table; +- err->last_jpeg_message = (int) JMSG_LASTMSGCODE - 1; +- +- err->addon_message_table = nullptr; +- err->first_addon_message = 0; /* for safety */ +- err->last_addon_message = 0; +- + return err; + } + +From 7789a8574b454ebd874522a70930ae4b40726da4 Mon Sep 17 00:00:00 2001 +From: Richard E Barber +Date: Sun, 19 May 2024 16:39:28 -0700 +Subject: [PATCH 2/2] removes redundant jpeg error message + +Co-authored-by: Lawrence37 <45837045+Lawrence37@users.noreply.github.com> +--- + rtengine/jdatasrc.cc | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/rtengine/jdatasrc.cc b/rtengine/jdatasrc.cc +index a0d12657f2..96b6f83b66 100644 +--- a/rtengine/jdatasrc.cc ++++ b/rtengine/jdatasrc.cc +@@ -399,10 +399,6 @@ my_jpeg_std_error (struct jpeg_error_mgr * err) + + /* override these functions */ + err->error_exit = my_error_exit; +- err->emit_message = emit_message; +- err->output_message = output_message; +- err->format_message = format_message; +- err->reset_error_mgr = reset_error_mgr; + + return err; + } diff --git a/graphics/rawtherapee/rawtherapee.SlackBuild b/graphics/rawtherapee/rawtherapee.SlackBuild index 80364a7a67b..e236ecd4213 100644 --- a/graphics/rawtherapee/rawtherapee.SlackBuild +++ b/graphics/rawtherapee/rawtherapee.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=rawtherapee -VERSION=${VERSION:-5.8} +VERSION=${VERSION:-5.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -79,6 +76,9 @@ 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 patch - thanks to kgha on LQ! +patch -p1 < $CWD/jpeg_turbo_3.0.3.patch + mkdir -p build cd build cmake \ diff --git a/graphics/rawtherapee/rawtherapee.info b/graphics/rawtherapee/rawtherapee.info index 2fb06432a85..c9a3e039ae1 100644 --- a/graphics/rawtherapee/rawtherapee.info +++ b/graphics/rawtherapee/rawtherapee.info @@ -1,8 +1,8 @@ PRGNAM="rawtherapee" -VERSION="5.8" +VERSION="5.10" HOMEPAGE="http://rawtherapee.com/" -DOWNLOAD="http://rawtherapee.com/shared/source/rawtherapee-5.8.tar.xz" -MD5SUM="7c4b2d8246664d84d5061e4c7271d3af" +DOWNLOAD="http://rawtherapee.com/shared/source/rawtherapee-5.10.tar.xz" +MD5SUM="7391fe9c75d1c54ffcd79325c1b59852" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libiptcdata" diff --git a/graphics/ufraw/patches/ufraw-0.22-exiv2-0.28.patch b/graphics/ufraw/patches/ufraw-0.22-exiv2-0.28.patch new file mode 100644 index 00000000000..bca74102d8d --- /dev/null +++ b/graphics/ufraw/patches/ufraw-0.22-exiv2-0.28.patch @@ -0,0 +1,69 @@ +--- A/ufraw_exiv2.cc 2024-01-15 12:04:55.379303793 +0100 ++++ B/ufraw_exiv2.cc 2024-01-15 12:08:36.773032241 +0100 +@@ -50,7 +50,7 @@ + uf->inputExifBuf = NULL; + uf->inputExifBufLen = 0; + +- Exiv2::Image::AutoPtr image; ++ Exiv2::Image::UniquePtr image; + if (uf->unzippedBuf != NULL) { + image = Exiv2::ImageFactory::open( + (const Exiv2::byte*)uf->unzippedBuf, uf->unzippedBufLen); +@@ -66,11 +66,7 @@ + if (exifData.empty()) { + std::string error(uf->filename); + error += ": No Exif data found in the file"; +-#if EXIV2_TEST_VERSION(0,27,0) +- throw Exiv2::Error(Exiv2::kerErrorMessage, error); +-#else +- throw Exiv2::Error(1, error); +-#endif ++ throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, error); + } + + /* List of tag names taken from exiv2's printSummary() in actions.cpp */ +@@ -135,7 +131,7 @@ + ufraw_message(UFRAW_SET_LOG, "%s\n", stderror.str().c_str()); + + return UFRAW_SUCCESS; +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2::Error& e) { + std::cerr.rdbuf(savecerr); + std::string s(e.what()); + ufraw_message(UFRAW_SET_WARNING, "%s\n", s.c_str()); +@@ -156,7 +152,7 @@ + if ((pos = exifData.findKey(Exiv2::ExifKey("Exif.Image.Orientation"))) + != exifData.end()) { + ufraw_message(UFRAW_SET_LOG, "Resetting %s from '%d' to '1'\n", +- pos->key().c_str(), pos->value().toLong()); ++ pos->key().c_str(), pos->value().toInt64()); + pos->setValue("1"); /* 1 = Normal orientation */ + } + } +@@ -327,7 +323,7 @@ + ufraw_message(UFRAW_SET_LOG, "%s\n", stderror.str().c_str()); + + return UFRAW_SUCCESS; +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2::Error& e) { + std::cerr.rdbuf(savecerr); + std::string s(e.what()); + ufraw_message(UFRAW_SET_WARNING, "%s\n", s.c_str()); +@@ -347,7 +343,7 @@ + + char *filename = + uf_win32_locale_filename_from_utf8(uf->conf->outputFilename); +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename); ++ Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename); + uf_win32_locale_filename_free(filename); + assert(image.get() != 0); + +@@ -367,7 +363,7 @@ + ufraw_message(UFRAW_SET_LOG, "%s\n", stderror.str().c_str()); + + return UFRAW_SUCCESS; +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2::Error& e) { + std::cerr.rdbuf(savecerr); + std::string s(e.what()); + ufraw_message(UFRAW_SET_WARNING, "%s\n", s.c_str()); diff --git a/graphics/ufraw/ufraw.SlackBuild b/graphics/ufraw/ufraw.SlackBuild index 309bc13ad48..0817845e97f 100644 --- a/graphics/ufraw/ufraw.SlackBuild +++ b/graphics/ufraw/ufraw.SlackBuild @@ -87,6 +87,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +for i in $CWD/patches/* ; do patch -p1 < $i ; done + autoreconf -fi CFLAGS="$SLKCFLAGS" \ diff --git a/graphics/zbar/configure.ac.patch b/graphics/zbar/configure.ac.patch new file mode 100644 index 00000000000..6cb7036a0b6 --- /dev/null +++ b/graphics/zbar/configure.ac.patch @@ -0,0 +1,14 @@ +diff -Naur zbar-0.23.93.orig/configure.ac zbar-0.23.93/configure.ac +--- zbar-0.23.93.orig/configure.ac 2024-01-09 10:13:01.000000000 +0100 ++++ zbar-0.23.93/configure.ac 2024-11-24 11:37:03.410992000 +0100 +@@ -675,8 +675,8 @@ + AS_IF([test "x$with_qt6" = "xno"], + PKG_CHECK_MODULES([QT], + [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 Qt5X11Extras >= 5.0], +- [MOC=`pkg-config Qt5 --variable=moc` +- QT_VERSION=`$PKG_CONFIG Qt5 --modversion` ++ [AC_CHECK_PROGS([MOC], [moc-qt5 moc]) ++ QT_VERSION=`$PKG_CONFIG Qt5Gui --modversion`; + qt_pkgconfig_file="zbar-qt5.pc" + ], + [with_qt="no"])) diff --git a/graphics/zbar/zbar.SlackBuild b/graphics/zbar/zbar.SlackBuild index ee8c4e64df5..b2fc50a76c9 100644 --- a/graphics/zbar/zbar.SlackBuild +++ b/graphics/zbar/zbar.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=zbar -VERSION=${VERSION:-0.23.90} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.23.93} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -84,6 +84,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/configure.ac.patch + autoreconf -fi CFLAGS="$SLKCFLAGS" \ diff --git a/graphics/zbar/zbar.info b/graphics/zbar/zbar.info index 32d50969f49..abda9ae4d62 100644 --- a/graphics/zbar/zbar.info +++ b/graphics/zbar/zbar.info @@ -1,8 +1,8 @@ PRGNAM="zbar" -VERSION="0.23.90" +VERSION="0.23.93" HOMEPAGE="https://sourceforge.net/projects/zbar/" -DOWNLOAD="https://github.com/mchehab/zbar/archive/0.23.90/zbar-0.23.90.tar.gz" -MD5SUM="cb1667e20c1d7acf1b9911414adaeb84" +DOWNLOAD="https://github.com/mchehab/zbar/archive/0.23.93/zbar-0.23.93.tar.gz" +MD5SUM="3f69d17f6495de023b59b3539ce5e605" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/FreeImage/FreeImage.SlackBuild b/libraries/FreeImage/FreeImage.SlackBuild index 2c1411efaeb..c6dfe5fe066 100644 --- a/libraries/FreeImage/FreeImage.SlackBuild +++ b/libraries/FreeImage/FreeImage.SlackBuild @@ -63,6 +63,9 @@ 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/gcc-version-fix-includes.patch +patch -p1 < $CWD/cross_platform_byteswap_fix.patch + CFLAGS="$SLKCFLAGS -fexceptions -fvisibility=hidden -DNO_LCMS" \ CXXFLAGS="$SLKCFLAGS -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy -std=c++14" \ make INSTALLDIR=$PKG/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG diff --git a/libraries/FreeImage/cross_platform_byteswap_fix.patch b/libraries/FreeImage/cross_platform_byteswap_fix.patch new file mode 100644 index 00000000000..9ae51e72171 --- /dev/null +++ b/libraries/FreeImage/cross_platform_byteswap_fix.patch @@ -0,0 +1,22 @@ +diff -up FreeImage/Source/LibJXR/image/decode/segdec.c.orig FreeImage/Source/LibJXR/image/decode/segdec.c +--- FreeImage/Source/LibJXR/image/decode/segdec.c.orig 2024-08-18 02:32:53.595421505 -0500 ++++ FreeImage/Source/LibJXR/image/decode/segdec.c 2024-08-18 02:33:41.184788298 -0500 +@@ -29,6 +29,18 @@ + #include "strcodec.h" + #include "decode.h" + ++// Conditional definition of _byteswap_ulong for cross-platform compatibility ++#ifdef _MSC_VER ++ #include // Use the Microsoft-specific function on MSVC ++#else ++ #include // Standard header for fixed-width integers ++ ++ // Define the Microsoft-specific function for non-MSVC compilers ++ static inline uint32_t _byteswap_ulong(uint32_t x) { ++ return __builtin_bswap32(x); // GCC/Clang built-in function for Linux ++ } ++#endif ++ + #ifdef MEM_TRACE + #define TRACE_MALLOC 1 + #define TRACE_NEW 0 diff --git a/libraries/FreeImage/gcc-version-fix-includes.patch b/libraries/FreeImage/gcc-version-fix-includes.patch new file mode 100644 index 00000000000..1f0d8bfee13 --- /dev/null +++ b/libraries/FreeImage/gcc-version-fix-includes.patch @@ -0,0 +1,46 @@ +diff -up FreeImage/Source/ZLib/gzlib.c.orig FreeImage/Source/ZLib/gzlib.c +--- FreeImage/Source/ZLib/gzlib.c.orig 2024-08-18 15:22:03.585726491 -0500 ++++ FreeImage/Source/ZLib/gzlib.c 2024-08-18 15:22:29.764924485 -0500 +@@ -4,6 +4,7 @@ + */ + + #include "gzguts.h" ++#include + + #if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__) + # define LSEEK _lseeki64 +diff -up FreeImage/Source/ZLib/gzread.c.orig FreeImage/Source/ZLib/gzread.c +--- FreeImage/Source/ZLib/gzread.c.orig 2024-08-18 15:22:41.952016662 -0500 ++++ FreeImage/Source/ZLib/gzread.c 2024-08-18 15:23:11.521240308 -0500 +@@ -4,6 +4,7 @@ + */ + + #include "gzguts.h" ++#include + + /* Local functions */ + local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *)); +diff -up FreeImage/Source/ZLib/gzwrite.c.orig FreeImage/Source/ZLib/gzwrite.c +--- FreeImage/Source/ZLib/gzwrite.c.orig 2024-08-18 15:23:24.238336499 -0500 ++++ FreeImage/Source/ZLib/gzwrite.c 2024-08-18 15:23:41.145464386 -0500 +@@ -4,6 +4,7 @@ + */ + + #include "gzguts.h" ++#include + + /* Local functions */ + local int gz_init OF((gz_statep)); + +diff -up FreeImage/Source/LibJXR/jxrgluelib/JXRGlueJxr.c.orig FreeImage/Source/LibJXR/jxrgluelib/JXRGlueJxr.c +--- FreeImage/Source/LibJXR/jxrgluelib/JXRGlueJxr.c.orig 2024-08-18 15:32:17.325371341 -0500 ++++ FreeImage/Source/LibJXR/jxrgluelib/JXRGlueJxr.c 2024-08-18 15:32:44.343575960 -0500 +@@ -28,7 +28,7 @@ + //*@@@---@@@@****************************************************************** + #include + #include +- ++#include + + static const char szHDPhotoFormat[] = "image/vnd.ms-photo"; + const U32 IFDEntryTypeSizes[] = { 0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8 }; diff --git a/libraries/MyGUI/MyGUI.SlackBuild b/libraries/MyGUI/MyGUI.SlackBuild index 6737d639819..6cd8f2c6be7 100644 --- a/libraries/MyGUI/MyGUI.SlackBuild +++ b/libraries/MyGUI/MyGUI.SlackBuild @@ -84,27 +84,33 @@ find -L . \ sed -i '71 i set(MYGUI_GCC_VISIBILITY_FLAGS "")' CMakeLists.txt sed -i 's/\${OIS_LIBRARIES}/${OIS_LIBRARIES} boost_system/g' Common/CMakeLists.txt +sed -i s/\#include\ \/\#include\ \\\n\#include\ \/ ./MyGUIEngine/include/MyGUI_Types.h mkdir -p build cd build cmake \ + -Bbuild \ + -GNinja \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DMYGUI_INSTALL_TOOLS=TRUE \ - -DMYGUI_INSTALL_DOCS=FALSE \ + -DMYGUI_INSTALL_DOCS=TRUE \ -DMYGUI_INSTALL_SAMPLES=FALSE \ -DMYGUI_INSTALL_MEDIA=TRUE \ - -DMYGUI_STATIC=FALSE \ + -DBUILD_SHARED_LIBS=TRUE \ -DMYGUI_USE_FREETYPE=TRUE \ -DMYGUI_BUILD_PLUGINS=TRUE \ -DMYGUI_BUILD_TOOLS=TRUE \ + -DMYGUI_BUILD_DEMOS=TRUE \ + -DMYGUI_RENDERSYSTEM=7 \ -DMYGUI_BUILD_WRAPPER=FALSE \ .. - make - make install DESTDIR=$PKG + "${NINJA:=ninja}" -C build + $NINJA -C build api-docs + DESTDIR="$PKG" $NINJA -C build install cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/libraries/ORBit2/ORBit2.SlackBuild b/libraries/ORBit2/ORBit2.SlackBuild index 6aac3d721e5..d47be71520a 100644 --- a/libraries/ORBit2/ORBit2.SlackBuild +++ b/libraries/ORBit2/ORBit2.SlackBuild @@ -79,6 +79,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +for i in $CWD/patches/* ; do patch -p1 < $i ; done + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/ORBit2/patches/ORBit2-configure-c99.patch b/libraries/ORBit2/patches/ORBit2-configure-c99.patch new file mode 100644 index 00000000000..8e267b56584 --- /dev/null +++ b/libraries/ORBit2/patches/ORBit2-configure-c99.patch @@ -0,0 +1,147 @@ +diff --git a/acinclude.m4 b/acinclude.m4 +index 3b67d9b5cae2d766..408b9845f8f1f328 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -23,7 +23,7 @@ AC_DEFUN([AC_CHECK_ALIGNOF], + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; $1 s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +diff --git a/configure b/configure +index 1fed47a1d26c3f36..63c32a20c6574672 100755 +--- a/configure ++++ b/configure +@@ -12346,7 +12346,7 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include +- main () ++ int main (void) + { + return 0; + } +@@ -12387,7 +12387,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_octet s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12434,7 +12434,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_boolean s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12481,7 +12481,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_char s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12528,7 +12528,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_wchar s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12575,7 +12575,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_short s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12622,7 +12622,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_long s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12669,7 +12669,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_long_long s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12716,7 +12716,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_float s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12763,7 +12763,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_double s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12810,7 +12810,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_long_double s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12857,7 +12857,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_struct s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +@@ -12904,7 +12904,7 @@ else + typedef struct {char s1;} CORBA_struct; + typedef void *CORBA_pointer; + struct test {char s1; CORBA_pointer s2;}; +- main() ++ int main(void) + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); +diff --git a/configure.in b/configure.in +index 04d4b2a397d53196..4a25f4e6ec84bdac 100644 +--- a/configure.in ++++ b/configure.in +@@ -220,7 +220,7 @@ dnl + dofus_save_libs="$LIBS" + LIBS="$ORBIT_LIBS $LIBS" + AC_TRY_RUN([ #include +- main () ++ int main (void) + { + return 0; + } ],, diff --git a/libraries/ORBit2/patches/pointer-type.patch b/libraries/ORBit2/patches/pointer-type.patch new file mode 100644 index 00000000000..f1e95644e4d --- /dev/null +++ b/libraries/ORBit2/patches/pointer-type.patch @@ -0,0 +1,11 @@ +--- ./src/orb/GIOP/giop-recv-buffer.c~ 2010-02-09 06:05:35.000000000 -0600 ++++ ./src/orb/GIOP/giop-recv-buffer.c 2024-01-30 09:31:58.383855651 -0600 +@@ -559,7 +559,7 @@ + ent->src_thread = giop_thread_self (); + ent->async_cb = NULL; + +- ent->cnx = giop_connection_ref (cnx); ++ ent->cnx = (GIOPConnection *)giop_connection_ref (cnx); + ent->msg_type = msg_type; + ent->request_id = request_id; + ent->buffer = NULL; diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild index bcf21cc5d83..096a1e6bd7b 100644 --- a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild +++ b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild @@ -67,6 +67,9 @@ find -L . \ # whose current versions at SBo cause build failure patch -p0 < $CWD/no-asio-occ.diff +# https://github.com/openscenegraph/OpenSceneGraph/issues/1111 +sed -i '/FFmpeg/d' CMakeLists.txt + mkdir -p build cd build cmake .. \ diff --git a/libraries/SDL_Pango/SDL_Pango.SlackBuild b/libraries/SDL_Pango/SDL_Pango.SlackBuild index de28ac1e0ca..64c1019e615 100644 --- a/libraries/SDL_Pango/SDL_Pango.SlackBuild +++ b/libraries/SDL_Pango/SDL_Pango.SlackBuild @@ -85,7 +85,7 @@ autoreconf -i libtoolize --copy --force automake -a -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/alure/alure.SlackBuild b/libraries/alure/alure.SlackBuild index 5f4e5f824f2..e3823d7ca67 100644 --- a/libraries/alure/alure.SlackBuild +++ b/libraries/alure/alure.SlackBuild @@ -98,6 +98,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DBUILD_STATIC=OFF \ -DCMAKE_BUILD_TYPE=Release .. + find -name build.make | xargs sed -e 's|\;| |g' -i make make install/strip DESTDIR=$PKG cd .. diff --git a/libraries/argtable/argtable.SlackBuild b/libraries/argtable/argtable.SlackBuild index cf4b4924db5..fbe46812f2c 100644 --- a/libraries/argtable/argtable.SlackBuild +++ b/libraries/argtable/argtable.SlackBuild @@ -93,6 +93,8 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ # man and html pages misuse autoconf macros patch -p1 < $CWD/doc_paths.diff +for i in $CWD/patches/* ; do patch -p1 < $i ; done + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/argtable/patches/argtable-2.13-Fix-implicit-function-declaration.patch b/libraries/argtable/patches/argtable-2.13-Fix-implicit-function-declaration.patch new file mode 100644 index 00000000000..14ade74afaa --- /dev/null +++ b/libraries/argtable/patches/argtable-2.13-Fix-implicit-function-declaration.patch @@ -0,0 +1,16 @@ +From febb2928d1e72c7adc914b2ef8e0611e1a5ea3fd Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Thu, 6 Oct 2022 18:10:52 +0100 +Subject: [PATCH] Fix implicit function declaration + +Bug: https://bugs.gentoo.org/871231 +--- a/src/arg_int.c ++++ b/src/arg_int.c +@@ -29,6 +29,7 @@ USA. + /* #endif */ + + #include "argtable2.h" ++#include + #include + + /* local error codes */ diff --git a/libraries/argtable/patches/argtable-2.13-Fix-undeclared-library-function.patch b/libraries/argtable/patches/argtable-2.13-Fix-undeclared-library-function.patch new file mode 100644 index 00000000000..7f42d43727a --- /dev/null +++ b/libraries/argtable/patches/argtable-2.13-Fix-undeclared-library-function.patch @@ -0,0 +1,28 @@ +From 519609d844f1e5bbf37407de8e43fa2d2be03262 Mon Sep 17 00:00:00 2001 +From: Brahmajit Das +Date: Sun, 7 May 2023 00:03:40 +0530 +Subject: [PATCH] Fix undeclared library function strcmp + +Bug: https://bugs.gentoo.org/885609 +--- a/tests/fntests.c ++++ b/tests/fntests.c +@@ -1,5 +1,6 @@ + #include "../src/argtable2.h" + #include ++#include + + /* for memory leak debugging */ + #ifdef DMALLOC +--- a/tests/test_file.c ++++ b/tests/test_file.c +@@ -21,6 +21,7 @@ USA. + + #include "../src/argtable2.h" + #include ++#include + + /* for memory leak debugging */ + #ifdef DMALLOC +-- +2.40.1 + diff --git a/libraries/aubio/README b/libraries/aubio/README index 0bab21e1c8a..d1c71a9330a 100644 --- a/libraries/aubio/README +++ b/libraries/aubio/README @@ -7,7 +7,7 @@ results too. jack and ffmpeg are optional dependencies. -The python bindings are built if numpy is available and the python3 -ones are built if numpy3 is available: if both versions of python -are present in the system, the aubio and aubiocut python scripts -will use python3. +The python2 bindings are built if python2-numpy is available and +the python3 ones are built if python3-numpy is available: if both +versions of numpy are present in the system, the aubio and aubiocut +python scripts will use python3. diff --git a/libraries/aubio/aubio.SlackBuild b/libraries/aubio/aubio.SlackBuild index 48e8c876be0..cce8c872ac0 100644 --- a/libraries/aubio/aubio.SlackBuild +++ b/libraries/aubio/aubio.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for aubio # Copyright 2008-2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2018-2019 Matteo Bernardini, Pisa, Italy +# Copyright 2018-2024 Matteo Bernardini, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -31,8 +31,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=aubio -VERSION=${VERSION:-0.4.9} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20240102_152d681} +WAFVER=${WAFVER:-2.0.26} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -73,7 +74,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION-2 -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -82,6 +83,10 @@ 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/ffmpeg7.patch + +install -m 0755 $CWD/waf-$WAFVER waf + # Fix detecting ffmpeg sed -i "s|'HAVE_' + i in ctx.env.define_key|'HAVE_' + i in ctx.env|" \ wscript || exit 1 @@ -116,6 +121,8 @@ cd .. cp -a $PRGNAM-$VERSION $PRGNAM-$VERSION-2 cd - +export CFLAGS="$SLKCFLAGS -fpermissive" + if $(python2 -c 'import numpy' 2>/dev/null); then python2 setup.py install --root=$PKG fi diff --git a/libraries/aubio/aubio.info b/libraries/aubio/aubio.info index c5d084ea720..aa912abca8c 100644 --- a/libraries/aubio/aubio.info +++ b/libraries/aubio/aubio.info @@ -1,8 +1,10 @@ PRGNAM="aubio" -VERSION="0.4.9" +VERSION="20240102_152d681" HOMEPAGE="https://aubio.org/" -DOWNLOAD="https://aubio.org/pub/aubio-0.4.9.tar.bz2" -MD5SUM="50c9c63b15a2692378af5d602892f16a" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/aubio-20240102_152d681.tar.xz \ + https://ponce.cc/slackware/sources/repo/waf-2.0.26" +MD5SUM="6ada0f768d8b78308f842d8e8862c325 \ + 730623b05efa37980aa15ff34a02e990" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/aubio/ffmpeg7.patch b/libraries/aubio/ffmpeg7.patch new file mode 100644 index 00000000000..cf0fe6ed68c --- /dev/null +++ b/libraries/aubio/ffmpeg7.patch @@ -0,0 +1,15 @@ +diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c +index 71ea8b5f..ad91f5eb 100644 +--- a/src/io/source_avcodec.c ++++ b/src/io/source_avcodec.c +@@ -345,8 +345,8 @@ void aubio_source_avcodec_reset_resampler(aubio_source_avcodec_t * s) + av_channel_layout_default(&input_layout, s->input_channels); + av_channel_layout_default(&output_layout, s->input_channels); + +- av_opt_set_chlayout(avr, "in_channel_layout", &input_layout, 0); +- av_opt_set_chlayout(avr, "out_channel_layout", &output_layout, 0); ++ av_opt_set_chlayout(avr, "in_chlayout", &input_layout, 0); ++ av_opt_set_chlayout(avr, "out_chlayout", &output_layout, 0); + #else + int64_t input_layout = av_get_default_channel_layout(s->input_channels); + int64_t output_layout = av_get_default_channel_layout(s->input_channels); diff --git a/libraries/bamf/add_compile_warning_flags.patch b/libraries/bamf/add_compile_warning_flags.patch deleted file mode 100644 index 203ccc75d33..00000000000 --- a/libraries/bamf/add_compile_warning_flags.patch +++ /dev/null @@ -1,71 +0,0 @@ -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=940164 - -diff -Naur bamf-0.5.4.orig/configure.ac bamf-0.5.4/configure.ac ---- bamf-0.5.4.orig/configure.ac 2018-11-07 23:39:11.355315678 +0100 -+++ bamf-0.5.4/configure.ac 2019-11-18 12:57:04.534000000 +0100 -@@ -18,14 +18,15 @@ - GNOME_COMPILE_WARNINGS(maximum) - - AM_MAINTAINER_MODE --AM_DISABLE_STATIC --AM_PROG_LIBTOOL - AC_ISC_POSIX - AC_SUBST(ACLOCAL_AMFLAFS, "$ACLOCAL_FLAGS -I m4") - - PKG_PROG_PKG_CONFIG - if test "x$PKG_CONFIG" = "x"; then AC_MSG_ERROR([You need to install pkg-config]); fi - -+LT_INIT([disable-static]) -+LT_LIB_M -+ - # Checks for programs. - AC_PROG_CC - AM_PROG_CC_C_O -@@ -154,8 +155,39 @@ - # - AM_PATH_GTK_3_0 - -+# Compile warnings -+AC_ARG_ENABLE(compile-warnings, -+ AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], -+ [Trun on compiler warnings]),, -+ [enable_compile_warnings=maximum]) -+ -+warning_flags= -+ -+case "$enable_compile_warnings" in -+no) -+warning_flags= -+;; -+minimum) -+warning_flags="-Wall" -+;; -+yes) -+warning_flags="-wall -Wno-error=deprecated-declarations" -+;; -+maximum|error) -+warning_flags="-Wall -Wno-error=deprecated-declarations -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration" -+if test "$enable_compile_warnings" = "error" ; then -+ warning_flags="$warning_flags -Werror" -+fi -+;; -+*) -+AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) -+;; -+esac -+AC_MSG_CHECKING(what warning flags to pass to the C compiler) -+AC_MSG_RESULT($warning_flags) -+ - dnl CFLAGS --CFLAGS="$CFLAGS -Wall -Werror -Wno-error=deprecated-declarations -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration -lm" -+CFLAGS="$CFLAGS $warning_flags $LIBM" - - AC_SUBST(BAMFDAEMON_CFLAGS) - AC_SUBST(BAMFDAEMON_LIBS) -@@ -190,5 +222,6 @@ - Headless tests: ${enable_headless_tests} - Coverage Reporting: ${use_gcov} - Export actions menus: ${enable_export_actions_menu} -+ Compiler Flags: ${CFLAGS} - - EOF diff --git a/libraries/bamf/bamf-no-gtester2xunit.patch b/libraries/bamf/bamf-no-gtester2xunit.patch new file mode 100644 index 00000000000..5c1e0fcd743 --- /dev/null +++ b/libraries/bamf/bamf-no-gtester2xunit.patch @@ -0,0 +1,22 @@ +diff -Naur bamf-0.5.6.orig/configure.ac bamf-0.5.6/configure.ac +--- bamf-0.5.6.orig/configure.ac 2022-02-17 19:16:55.346057503 +0100 ++++ bamf-0.5.6/configure.ac 2023-02-04 19:24:42.506720000 +0100 +@@ -106,18 +106,6 @@ + GTK_DOC_CHECK(1.0) + + ########################### +-# gtester2xunit checks # +-########################### +- +-AC_PATH_PROG([PYTHON],[python3]) +-AC_MSG_CHECKING(for gtester2xunit dependencies) +-if !($PYTHON -c "from lxml import etree" 2> /dev/null); then +- AC_MSG_RESULT([no]) +- AC_MSG_ERROR([You need to install python3-lxml]); +-fi +-AC_MSG_RESULT([yes]) +- +-########################### + # Headless tests + ########################### + AC_ARG_ENABLE([headless-tests], diff --git a/libraries/bamf/bamf.SlackBuild b/libraries/bamf/bamf.SlackBuild index a381620ac18..38d46e792a8 100644 --- a/libraries/bamf/bamf.SlackBuild +++ b/libraries/bamf/bamf.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=bamf -VERSION=${VERSION:-0.5.4} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.5.6} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -80,7 +80,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/add_compile_warning_flags.patch +patch -p1 < $CWD/bamf-no-gtester2xunit.patch autoreconf -vif CFLAGS="$SLKCFLAGS" \ diff --git a/libraries/bamf/bamf.info b/libraries/bamf/bamf.info index 1effbc4410a..b57453a2fe2 100644 --- a/libraries/bamf/bamf.info +++ b/libraries/bamf/bamf.info @@ -1,8 +1,8 @@ PRGNAM="bamf" -VERSION="0.5.4" +VERSION="0.5.6" HOMEPAGE="https://launchpad.net/bamf" -DOWNLOAD="https://launchpad.net/bamf/0.5/0.5.4/+download/bamf-0.5.4.tar.gz" -MD5SUM="e5078ec8f6c8a9d77242010dcd3b3217" +DOWNLOAD="https://launchpad.net/bamf/0.5/0.5.6/+download/bamf-0.5.6.tar.gz" +MD5SUM="49ed19dd5db0b4109f4dc2e4fe2ed13d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gnome-common" diff --git a/libraries/chromaprint/chromaprint.SlackBuild b/libraries/chromaprint/chromaprint.SlackBuild index 3b01f015bc0..9d2f89e98ed 100644 --- a/libraries/chromaprint/chromaprint.SlackBuild +++ b/libraries/chromaprint/chromaprint.SlackBuild @@ -83,6 +83,10 @@ 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/patches/ffmpeg5.patch +patch -p1 < $CWD/patches/aa67c95b.patch +patch -p1 < $CWD/patches/ffmpeg7.patch + mkdir -p build cd build cmake \ diff --git a/libraries/chromaprint/patches/aa67c95b.patch b/libraries/chromaprint/patches/aa67c95b.patch new file mode 100644 index 00000000000..ecfa7d05ddf --- /dev/null +++ b/libraries/chromaprint/patches/aa67c95b.patch @@ -0,0 +1,50 @@ +From 82781d02cd3063d071a501218297a90bde9a314f Mon Sep 17 00:00:00 2001 +From: Marshal Walker +Date: Thu, 8 Dec 2022 11:53:58 -0500 +Subject: [PATCH] ffmpeg5 fix for issue #122 + +tested on Arch Linux, needs testing on win/mac/etc (should be fine tho) +--- + src/audio/ffmpeg_audio_processor_swresample.h | 4 ++-- + src/audio/ffmpeg_audio_reader.h | 5 +++-- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/audio/ffmpeg_audio_processor_swresample.h b/src/audio/ffmpeg_audio_processor_swresample.h +index b1d4bea..e8fcb3f 100644 +--- a/src/audio/ffmpeg_audio_processor_swresample.h ++++ b/src/audio/ffmpeg_audio_processor_swresample.h +@@ -29,7 +29,7 @@ class FFmpegAudioProcessor { + } + + void SetInputChannelLayout(AVChannelLayout *channel_layout) { +- av_opt_set_int(m_swr_ctx, "in_channel_layout", channel_layout->u.mask, 0); ++ av_opt_set_chlayout(m_swr_ctx, "in_chlayout", channel_layout, 0); + } + + void SetInputSampleFormat(AVSampleFormat sample_format) { +@@ -41,7 +41,7 @@ class FFmpegAudioProcessor { + } + + void SetOutputChannelLayout(AVChannelLayout *channel_layout) { +- av_opt_set_int(m_swr_ctx, "out_channel_layout", channel_layout->u.mask, 0); ++ av_opt_set_chlayout(m_swr_ctx, "out_chlayout", channel_layout, 0); + } + + void SetOutputSampleFormat(AVSampleFormat sample_format) { +diff --git a/src/audio/ffmpeg_audio_reader.h b/src/audio/ffmpeg_audio_reader.h +index 1c6b346..35b2934 100644 +--- a/src/audio/ffmpeg_audio_reader.h ++++ b/src/audio/ffmpeg_audio_reader.h +@@ -301,9 +301,10 @@ inline bool FFmpegAudioReader::Read(const int16_t **data, size_t *size) { + } else { + m_has_more_frames = false; + } ++ } else { ++ SetError("Error decoding the audio source", ret); ++ return false; + } +- SetError("Error decoding the audio source", ret); +- return false; + } + + if (m_frame->nb_samples > 0) { diff --git a/libraries/chromaprint/patches/ffmpeg5.patch b/libraries/chromaprint/patches/ffmpeg5.patch new file mode 100644 index 00000000000..97fc0748855 --- /dev/null +++ b/libraries/chromaprint/patches/ffmpeg5.patch @@ -0,0 +1,550 @@ +From 8ccad6937177b1b92e40ab8f4447ea27bac009a7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= +Date: Fri, 4 Nov 2022 21:47:38 +0100 +Subject: [PATCH] Use FFmpeg 5.x (#120) + +* Use FFmpeg 5.1.2 for CI builds + +* Build on Ubuntu 20.04 + +* Upgrade code to FFmpeg 5.x APIs + +* Only set FFmpeg include dirs if building tools + +* No longer needed + +* Use ubuntu 20.04 +--- + .github/workflows/build.yml | 6 +- + CMakeLists.txt | 16 -- + package/build.sh | 4 +- + src/audio/ffmpeg_audio_processor.h | 2 - + src/audio/ffmpeg_audio_processor_avresample.h | 72 ------- + src/audio/ffmpeg_audio_processor_swresample.h | 18 +- + src/audio/ffmpeg_audio_reader.h | 197 +++++++++--------- + tests/CMakeLists.txt | 6 + + 8 files changed, 122 insertions(+), 199 deletions(-) + delete mode 100644 src/audio/ffmpeg_audio_processor_avresample.h + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f8d6a32..4da2405 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,9 +84,6 @@ find_package(FFmpeg) + if(FFMPEG_LIBRARIES) + cmake_push_check_state(RESET) + set(CMAKE_REQUIRED_LIBRARIES ${FFMPEG_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -lm) +- check_function_exists(av_packet_unref HAVE_AV_PACKET_UNREF) +- check_function_exists(av_frame_alloc HAVE_AV_FRAME_ALLOC) +- check_function_exists(av_frame_free HAVE_AV_FRAME_FREE) + cmake_pop_check_state() + endif() + +@@ -163,14 +160,11 @@ message(STATUS "Using ${FFT_LIB} for FFT calculations") + if(NOT AUDIO_PROCESSOR_LIB) + if(FFMPEG_LIBSWRESAMPLE_FOUND) + set(AUDIO_PROCESSOR_LIB "swresample") +- elseif(FFMPEG_LIBAVRESAMPLE_FOUND) +- set(AUDIO_PROCESSOR_LIB "avresample") + endif() + endif() + + if(AUDIO_PROCESSOR_LIB STREQUAL "swresample") + if(FFMPEG_LIBSWRESAMPLE_FOUND) +- set(USE_AVRESAMPLE OFF) + set(USE_SWRESAMPLE ON) + set(AUDIO_PROCESSOR_LIBRARIES ${FFMPEG_LIBSWRESAMPLE_LIBRARIES}) + set(AUDIO_PROCESSOR_INCLUDE_DIRS ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS}) +@@ -178,16 +172,6 @@ if(AUDIO_PROCESSOR_LIB STREQUAL "swresample") + message(FATAL_ERROR "Selected ${AUDIO_PROCESSOR_LIB} for audio processing, but the library is not found") + endif() + message(STATUS "Using ${AUDIO_PROCESSOR_LIB} for audio conversion") +-elseif(AUDIO_PROCESSOR_LIB STREQUAL "avresample") +- if(FFMPEG_LIBAVRESAMPLE_FOUND) +- set(USE_AVRESAMPLE ON) +- set(USE_SWRESAMPLE OFF) +- set(AUDIO_PROCESSOR_LIBRARIES ${FFMPEG_LIBAVRESAMPLE_LIBRARIES}) +- set(AUDIO_PROCESSOR_INCLUDE_DIRS ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS}) +- else() +- message(FATAL_ERROR "Selected ${AUDIO_PROCESSOR_LIB} for audio processing, but the library is not found") +- endif() +- message(STATUS "Using ${AUDIO_PROCESSOR_LIB} for audio conversion") + else() + message(STATUS "Building without audio conversion support, please install FFmpeg with libswresample") + endif() +diff --git a/src/audio/ffmpeg_audio_processor.h b/src/audio/ffmpeg_audio_processor.h +index 7628fc7..39f4f6d 100644 +--- a/src/audio/ffmpeg_audio_processor.h ++++ b/src/audio/ffmpeg_audio_processor.h +@@ -10,8 +10,6 @@ + + #if defined(USE_SWRESAMPLE) + #include "audio/ffmpeg_audio_processor_swresample.h" +-#elif defined(USE_AVRESAMPLE) +-#include "audio/ffmpeg_audio_processor_avresample.h" + #else + #error "no audio processing library" + #endif +diff --git a/src/audio/ffmpeg_audio_processor_avresample.h b/src/audio/ffmpeg_audio_processor_avresample.h +deleted file mode 100644 +index bd85f92..0000000 +--- a/src/audio/ffmpeg_audio_processor_avresample.h ++++ /dev/null +@@ -1,72 +0,0 @@ +-// Copyright (C) 2016 Lukas Lalinsky +-// Distributed under the MIT license, see the LICENSE file for details. +- +-#ifndef CHROMAPRINT_AUDIO_FFMPEG_AUDIO_PROCESSOR_AVRESAMPLE_H_ +-#define CHROMAPRINT_AUDIO_FFMPEG_AUDIO_PROCESSOR_AVRESAMPLE_H_ +- +-extern "C" { +-#include +-} +- +-namespace chromaprint { +- +-class FFmpegAudioProcessor { +-public: +- FFmpegAudioProcessor() { +- m_resample_ctx = avresample_alloc_context(); +- } +- +- ~FFmpegAudioProcessor() { +- avresample_free(&m_resample_ctx); +- } +- +- void SetCompatibleMode() { +- av_opt_set_int(m_resample_ctx, "filter_size", 16, 0); +- av_opt_set_int(m_resample_ctx, "phase_shift", 8, 0); +- av_opt_set_int(m_resample_ctx, "linear_interp", 1, 0); +- av_opt_set_double(m_resample_ctx, "cutoff", 0.8, 0); +- } +- +- void SetInputChannelLayout(int64_t channel_layout) { +- av_opt_set_int(m_resample_ctx, "in_channel_layout", channel_layout, 0); +- } +- +- void SetInputSampleFormat(AVSampleFormat sample_format) { +- av_opt_set_int(m_resample_ctx, "in_sample_fmt", sample_format, 0); +- } +- +- void SetInputSampleRate(int sample_rate) { +- av_opt_set_int(m_resample_ctx, "in_sample_rate", sample_rate, 0); +- } +- +- void SetOutputChannelLayout(int64_t channel_layout) { +- av_opt_set_int(m_resample_ctx, "out_channel_layout", channel_layout, 0); +- } +- +- void SetOutputSampleFormat(AVSampleFormat sample_format) { +- av_opt_set_int(m_resample_ctx, "out_sample_fmt", sample_format, 0); +- } +- +- void SetOutputSampleRate(int sample_rate) { +- av_opt_set_int(m_resample_ctx, "out_sample_fmt", sample_rate, 0); +- } +- +- int Init() { +- return avresample_open(m_resample_ctx); +- } +- +- int Convert(uint8_t **out, int out_count, const uint8_t **in, int in_count) { +- return avresample_convert(m_resample_ctx, out, 0, out_count, (uint8_t **) in, 0, in_count); +- } +- +- int Flush(uint8_t **out, int out_count) { +- return avresample_read(m_resample_ctx, out, out_count); +- } +- +-private: +- AVAudioResampleContext *m_resample_ctx = nullptr; +-}; +- +-}; // namespace chromaprint +- +-#endif +diff --git a/src/audio/ffmpeg_audio_processor_swresample.h b/src/audio/ffmpeg_audio_processor_swresample.h +index b86266b..b1d4bea 100644 +--- a/src/audio/ffmpeg_audio_processor_swresample.h ++++ b/src/audio/ffmpeg_audio_processor_swresample.h +@@ -28,30 +28,28 @@ class FFmpegAudioProcessor { + av_opt_set_double(m_swr_ctx, "cutoff", 0.8, 0); + } + +- void SetInputChannelLayout(int64_t channel_layout) { +- av_opt_set_int(m_swr_ctx, "icl", channel_layout, 0); +- av_opt_set_int(m_swr_ctx, "ich", av_get_channel_layout_nb_channels(channel_layout), 0); ++ void SetInputChannelLayout(AVChannelLayout *channel_layout) { ++ av_opt_set_int(m_swr_ctx, "in_channel_layout", channel_layout->u.mask, 0); + } + + void SetInputSampleFormat(AVSampleFormat sample_format) { +- av_opt_set_int(m_swr_ctx, "isf", sample_format, 0); ++ av_opt_set_sample_fmt(m_swr_ctx, "in_sample_fmt", sample_format, 0); + } + + void SetInputSampleRate(int sample_rate) { +- av_opt_set_int(m_swr_ctx, "isr", sample_rate, 0); ++ av_opt_set_int(m_swr_ctx, "in_sample_rate", sample_rate, 0); + } + +- void SetOutputChannelLayout(int64_t channel_layout) { +- av_opt_set_int(m_swr_ctx, "ocl", channel_layout, 0); +- av_opt_set_int(m_swr_ctx, "och", av_get_channel_layout_nb_channels(channel_layout), 0); ++ void SetOutputChannelLayout(AVChannelLayout *channel_layout) { ++ av_opt_set_int(m_swr_ctx, "out_channel_layout", channel_layout->u.mask, 0); + } + + void SetOutputSampleFormat(AVSampleFormat sample_format) { +- av_opt_set_int(m_swr_ctx, "osf", sample_format, 0); ++ av_opt_set_sample_fmt(m_swr_ctx, "out_sample_fmt", sample_format, 0); + } + + void SetOutputSampleRate(int sample_rate) { +- av_opt_set_int(m_swr_ctx, "osr", sample_rate, 0); ++ av_opt_set_int(m_swr_ctx, "out_sample_rate", sample_rate, 0); + } + + int Init() { +diff --git a/src/audio/ffmpeg_audio_reader.h b/src/audio/ffmpeg_audio_reader.h +index 5550164..1c6b346 100644 +--- a/src/audio/ffmpeg_audio_reader.h ++++ b/src/audio/ffmpeg_audio_reader.h +@@ -62,7 +62,7 @@ class FFmpegAudioReader { + bool Read(const int16_t **data, size_t *size); + + bool IsOpen() const { return m_opened; } +- bool IsFinished() const { return m_finished && !m_got_frame; } ++ bool IsFinished() const { return !m_has_more_packets && !m_has_more_frames; } + + std::string GetError() const { return m_error; } + int GetErrorCode() const { return m_error_code; } +@@ -74,20 +74,19 @@ class FFmpegAudioReader { + uint8_t *m_convert_buffer[1] = { nullptr }; + int m_convert_buffer_nb_samples = 0; + +- AVInputFormat *m_input_fmt = nullptr; ++ const AVInputFormat *m_input_fmt = nullptr; + AVDictionary *m_input_opts = nullptr; + + AVFormatContext *m_format_ctx = nullptr; + AVCodecContext *m_codec_ctx = nullptr; +- AVFrame *m_frame = nullptr; + int m_stream_index = -1; + std::string m_error; + int m_error_code = 0; +- bool m_finished = false; + bool m_opened = false; +- int m_got_frame = 0; +- AVPacket m_packet; +- AVPacket m_packet0; ++ bool m_has_more_packets = true; ++ bool m_has_more_frames = true; ++ AVPacket *m_packet = nullptr; ++ AVFrame *m_frame = nullptr; + + int m_output_sample_rate = 0; + int m_output_channels = 0; +@@ -98,19 +97,12 @@ class FFmpegAudioReader { + + inline FFmpegAudioReader::FFmpegAudioReader() { + av_log_set_level(AV_LOG_QUIET); +- +- av_init_packet(&m_packet); +- m_packet.data = nullptr; +- m_packet.size = 0; +- +- m_packet0 = m_packet; + } + + inline FFmpegAudioReader::~FFmpegAudioReader() { + Close(); + av_dict_free(&m_input_opts); + av_freep(&m_convert_buffer[0]); +- av_packet_unref(&m_packet0); + } + + inline bool FFmpegAudioReader::SetInputFormat(const char *name) { +@@ -135,11 +127,10 @@ inline bool FFmpegAudioReader::Open(const std::string &file_name) { + + Close(); + +- av_init_packet(&m_packet); +- m_packet.data = nullptr; +- m_packet.size = 0; +- +- m_packet0 = m_packet; ++ m_packet = av_packet_alloc(); ++ if (!m_packet) { ++ return false; ++ } + + ret = avformat_open_input(&m_format_ctx, file_name.c_str(), m_input_fmt, &m_input_opts); + if (ret < 0) { +@@ -153,26 +144,31 @@ inline bool FFmpegAudioReader::Open(const std::string &file_name) { + return false; + } + +- AVCodec *codec; ++ const AVCodec *codec; + ret = av_find_best_stream(m_format_ctx, AVMEDIA_TYPE_AUDIO, -1, -1, &codec, 0); + if (ret < 0) { + SetError("Could not find any audio stream in the file", ret); + return false; + } + m_stream_index = ret; ++ auto stream = m_format_ctx->streams[m_stream_index]; + +- m_codec_ctx = m_format_ctx->streams[m_stream_index]->codec; ++ m_codec_ctx = avcodec_alloc_context3(codec); + m_codec_ctx->request_sample_fmt = AV_SAMPLE_FMT_S16; + ++ ret = avcodec_parameters_to_context(m_codec_ctx, stream->codecpar); ++ if (ret < 0) { ++ SetError("Could not copy the stream parameters", ret); ++ return false; ++ } ++ + ret = avcodec_open2(m_codec_ctx, codec, nullptr); + if (ret < 0) { + SetError("Could not open the codec", ret); + return false; + } + +- if (!m_codec_ctx->channel_layout) { +- m_codec_ctx->channel_layout = av_get_default_channel_layout(m_codec_ctx->channels); +- } ++ av_dump_format(m_format_ctx, 0, "foo", 0); + + m_frame = av_frame_alloc(); + if (!m_frame) { +@@ -183,19 +179,23 @@ inline bool FFmpegAudioReader::Open(const std::string &file_name) { + m_output_sample_rate = m_codec_ctx->sample_rate; + } + +- if (!m_output_channels) { +- m_output_channels = m_codec_ctx->channels; ++ AVChannelLayout output_channel_layout; ++ if (m_output_channels) { ++ av_channel_layout_default(&output_channel_layout, m_output_channels); ++ } else { ++ m_output_channels = m_codec_ctx->ch_layout.nb_channels; ++ av_channel_layout_default(&output_channel_layout, m_output_channels); + } + +- if (m_codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16 || m_codec_ctx->channels != m_output_channels || m_codec_ctx->sample_rate != m_output_sample_rate) { ++ if (m_codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16 || m_codec_ctx->ch_layout.nb_channels != m_output_channels || m_codec_ctx->sample_rate != m_output_sample_rate) { + m_converter.reset(new FFmpegAudioProcessor()); + m_converter->SetCompatibleMode(); + m_converter->SetInputSampleFormat(m_codec_ctx->sample_fmt); + m_converter->SetInputSampleRate(m_codec_ctx->sample_rate); +- m_converter->SetInputChannelLayout(m_codec_ctx->channel_layout); ++ m_converter->SetInputChannelLayout(&(m_codec_ctx->ch_layout)); + m_converter->SetOutputSampleFormat(AV_SAMPLE_FMT_S16); + m_converter->SetOutputSampleRate(m_output_sample_rate); +- m_converter->SetOutputChannelLayout(av_get_default_channel_layout(m_output_channels)); ++ m_converter->SetOutputChannelLayout(&output_channel_layout); + auto ret = m_converter->Init(); + if (ret != 0) { + SetError("Could not create an audio converter instance", ret); +@@ -203,10 +203,11 @@ inline bool FFmpegAudioReader::Open(const std::string &file_name) { + } + } + ++ av_channel_layout_uninit(&output_channel_layout); ++ + m_opened = true; +- m_finished = false; +- m_got_frame = 0; +- m_nb_packets = 0; ++ m_has_more_packets = true; ++ m_has_more_frames = true; + m_decode_error = 0; + + return true; +@@ -214,6 +215,7 @@ inline bool FFmpegAudioReader::Open(const std::string &file_name) { + + inline void FFmpegAudioReader::Close() { + av_frame_free(&m_frame); ++ av_packet_free(&m_packet); + + m_stream_index = -1; + +@@ -252,91 +254,98 @@ inline bool FFmpegAudioReader::Read(const int16_t **data, size_t *size) { + return false; + } + ++ *data = nullptr; ++ *size = 0; ++ + int ret; ++ bool needs_packet = false; + while (true) { +- while (m_packet.size <= 0) { +- av_packet_unref(&m_packet0); +- av_init_packet(&m_packet); +- m_packet.data = nullptr; +- m_packet.size = 0; +- ret = av_read_frame(m_format_ctx, &m_packet); ++ while (needs_packet && m_packet->size == 0) { ++ ret = av_read_frame(m_format_ctx, m_packet); + if (ret < 0) { + if (ret == AVERROR_EOF) { +- m_finished = true; ++ needs_packet = false; ++ m_has_more_packets = false; + break; +- } else { ++ } ++ SetError("Error reading from the audio source", ret); ++ return false; ++ } ++ if (m_packet->stream_index == m_stream_index) { ++ needs_packet = false; ++ } else { ++ av_packet_unref(m_packet); ++ } ++ } ++ ++ if (m_packet->size != 0) { ++ ret = avcodec_send_packet(m_codec_ctx, m_packet); ++ if (ret < 0) { ++ if (ret != AVERROR(EAGAIN)) { + SetError("Error reading from the audio source", ret); + return false; + } +- } +- m_packet0 = m_packet; +- if (m_packet.stream_index != m_stream_index) { +- m_packet.data = nullptr; +- m_packet.size = 0; + } else { +- m_nb_packets++; ++ av_packet_unref(m_packet); + } + } + +- ret = avcodec_decode_audio4(m_codec_ctx, m_frame, &m_got_frame, &m_packet); ++ ret = avcodec_receive_frame(m_codec_ctx, m_frame); + if (ret < 0) { +- if (m_decode_error) { +- SetError("Error decoding audio frame", m_decode_error); +- return false; ++ if (ret == AVERROR_EOF) { ++ m_has_more_frames = false; ++ } else if (ret == AVERROR(EAGAIN)) { ++ if (m_has_more_packets) { ++ needs_packet = true; ++ continue; ++ } else { ++ m_has_more_frames = false; ++ } + } +- m_decode_error = ret; +- m_packet.data = nullptr; +- m_packet.size = 0; +- continue; ++ SetError("Error decoding the audio source", ret); ++ return false; + } + +- break; +- } +- +- m_decode_error = 0; +- +- const int decoded = std::min(ret, m_packet.size); +- m_packet.data += decoded; +- m_packet.size -= decoded; +- +- if (m_got_frame) { +- if (m_converter) { +- if (m_frame->nb_samples > m_convert_buffer_nb_samples) { +- int linsize; +- av_freep(&m_convert_buffer[0]); +- m_convert_buffer_nb_samples = std::max(1024 * 8, m_frame->nb_samples); +- ret = av_samples_alloc(m_convert_buffer, &linsize, m_codec_ctx->channels, m_convert_buffer_nb_samples, AV_SAMPLE_FMT_S16, 1); +- if (ret < 0) { +- SetError("Couldn't allocate audio converter buffer", ret); ++ if (m_frame->nb_samples > 0) { ++ if (m_converter) { ++ if (m_frame->nb_samples > m_convert_buffer_nb_samples) { ++ int linsize; ++ av_freep(&m_convert_buffer[0]); ++ m_convert_buffer_nb_samples = std::max(1024 * 8, m_frame->nb_samples); ++ ret = av_samples_alloc(m_convert_buffer, &linsize, m_codec_ctx->ch_layout.nb_channels, m_convert_buffer_nb_samples, AV_SAMPLE_FMT_S16, 1); ++ if (ret < 0) { ++ SetError("Couldn't allocate audio converter buffer", ret); ++ return false; ++ } ++ } ++ auto nb_samples = m_converter->Convert(m_convert_buffer, m_convert_buffer_nb_samples, (const uint8_t **) m_frame->data, m_frame->nb_samples); ++ if (nb_samples < 0) { ++ SetError("Couldn't convert audio", ret); + return false; + } +- } +- auto nb_samples = m_converter->Convert(m_convert_buffer, m_convert_buffer_nb_samples, (const uint8_t **) m_frame->data, m_frame->nb_samples); +- if (nb_samples < 0) { +- SetError("Couldn't convert audio", ret); +- return false; +- } +- *data = (const int16_t *) m_convert_buffer[0]; +- *size = nb_samples; +- } else { +- *data = (const int16_t *) m_frame->data[0]; +- *size = m_frame->nb_samples; +- } +- } else { +- if (m_finished && m_converter) { +- auto nb_samples = m_converter->Flush(m_convert_buffer, m_convert_buffer_nb_samples); +- if (nb_samples < 0) { +- SetError("Couldn't convert audio", ret); +- return false; +- } else if (nb_samples > 0) { +- m_got_frame = 1; + *data = (const int16_t *) m_convert_buffer[0]; + *size = nb_samples; ++ } else { ++ *data = (const int16_t *) m_frame->data[0]; ++ *size = m_frame->nb_samples; ++ } ++ } else { ++ if (m_converter) { ++ if (IsFinished()) { ++ auto nb_samples = m_converter->Flush(m_convert_buffer, m_convert_buffer_nb_samples); ++ if (nb_samples < 0) { ++ SetError("Couldn't convert audio", ret); ++ return false; ++ } else if (nb_samples > 0) { ++ *data = (const int16_t *) m_convert_buffer[0]; ++ *size = nb_samples; ++ } ++ } + } + } +- } + +- return true; ++ return true; ++ } + } + + inline void FFmpegAudioReader::SetError(const char *message, int errnum) { +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index a2b517b..123e643 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -38,6 +38,12 @@ set(SRCS + + if(BUILD_TOOLS) + set(SRCS ${SRCS} ../src/audio/ffmpeg_audio_reader_test.cpp) ++ include_directories( ++ ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ++ ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ++ ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ++ ${AUDIO_PROCESSOR_INCLUDE_DIRS} ++ ) + link_libraries(fpcalc_libs) + endif() + diff --git a/libraries/chromaprint/patches/ffmpeg7.patch b/libraries/chromaprint/patches/ffmpeg7.patch new file mode 100644 index 00000000000..5618f8c98b7 --- /dev/null +++ b/libraries/chromaprint/patches/ffmpeg7.patch @@ -0,0 +1,20 @@ +diff --git a/src/audio/ffmpeg_audio_reader.h b/src/audio/ffmpeg_audio_reader.h +index 35b2934..0b032e5 100644 +--- a/src/audio/ffmpeg_audio_reader.h ++++ b/src/audio/ffmpeg_audio_reader.h +@@ -118,8 +118,13 @@ inline bool FFmpegAudioReader::SetInputSampleRate(int sample_rate) { + + inline bool FFmpegAudioReader::SetInputChannels(int channels) { + char buf[64]; +- sprintf(buf, "%d", channels); +- return av_dict_set(&m_input_opts, "channels", buf, 0) >= 0; ++ if (channels == 1) ++ sprintf(buf, "%s", "mono"); ++ else if (channels == 2) ++ sprintf(buf, "%s", "stereo"); ++ else ++ return false; ++ return av_dict_set(&m_input_opts, "ch_layout", buf, 0) >= 0; + } + + inline bool FFmpegAudioReader::Open(const std::string &file_name) { diff --git a/libraries/compiz-plugins-experimental/compiz-plugins-experimental.SlackBuild b/libraries/compiz-plugins-experimental/compiz-plugins-experimental.SlackBuild index 06780bfb97c..620857d696c 100644 --- a/libraries/compiz-plugins-experimental/compiz-plugins-experimental.SlackBuild +++ b/libraries/compiz-plugins-experimental/compiz-plugins-experimental.SlackBuild @@ -79,6 +79,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/gcc13.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/compiz-plugins-experimental/gcc13.patch b/libraries/compiz-plugins-experimental/gcc13.patch new file mode 100644 index 00000000000..8edce5b67ed --- /dev/null +++ b/libraries/compiz-plugins-experimental/gcc13.patch @@ -0,0 +1,169 @@ +https://bbs.archlinux.org/viewtopic.php?id=290483 + +diff --git a/src/anaglyph/anaglyph.c b/src/anaglyph/anaglyph.c +index 5ee0b32..94dec30 100644 +--- a/src/anaglyph/anaglyph.c ++++ b/src/anaglyph/anaglyph.c +@@ -21,6 +21,7 @@ + #include + #include "anaglyph_options.h" + ++#include + + #define GET_ANAGLYPH_CORE(c) \ + ((AnaglyphCore *) (c)->base.privates[corePrivateIndex].ptr) +diff --git a/src/atlantis/atlantis-internal.h b/src/atlantis/atlantis-internal.h +index 4b3e903..4ce80cd 100644 +--- a/src/atlantis/atlantis-internal.h ++++ b/src/atlantis/atlantis-internal.h +@@ -104,6 +104,7 @@ + + #include + #include ++#include + + /* some constants */ + #define PI M_PI +diff --git a/src/elements/elements.c b/src/elements/elements.c +index 9c3d61f..f24ebc0 100644 +--- a/src/elements/elements.c ++++ b/src/elements/elements.c +@@ -50,6 +50,9 @@ + + #include + #include "elements_options.h" ++ ++#include ++ + #define GET_DISPLAY(d) \ + ((eDisplay *) (d)->base.privates[displayPrivateIndex].ptr) + +diff --git a/src/fakeargb/fakeargb.c b/src/fakeargb/fakeargb.c +index 1c8c241..c76c1b7 100644 +--- a/src/fakeargb/fakeargb.c ++++ b/src/fakeargb/fakeargb.c +@@ -22,6 +22,8 @@ + #include + #include "fakeargb_options.h" + ++#include ++ + static int displayPrivateIndex; + + typedef struct _FakeDisplay +diff --git a/src/fireflies/fireflies.c b/src/fireflies/fireflies.c +index 6d271c2..6f7b1a9 100644 +--- a/src/fireflies/fireflies.c ++++ b/src/fireflies/fireflies.c +@@ -32,6 +32,8 @@ + #include + #include "fireflies_options.h" + ++#include ++ + #define GET_SNOW_DISPLAY(d) \ + ((SnowDisplay *) (d)->base.privates[displayPrivateIndex].ptr) + +diff --git a/src/freewins/freewins.c b/src/freewins/freewins.c +index bd55f56..fffc337 100644 +--- a/src/freewins/freewins.c ++++ b/src/freewins/freewins.c +@@ -50,6 +50,8 @@ + + #include "freewins.h" + ++#include ++ + static CompMetadata freewinsMetadata; + + /* Information on window resize */ +diff --git a/src/freewins/input.c b/src/freewins/input.c +index 96a9009..7c35d1e 100644 +--- a/src/freewins/input.c ++++ b/src/freewins/input.c +@@ -50,6 +50,8 @@ + #include "freewins.h" + #include + ++#include ++ + /* ------ Input Prevention -------------------------------------------*/ + + /* Shape the IPW +diff --git a/src/smartput/smartput.c b/src/smartput/smartput.c +index a43f4c1..05bcbf1 100644 +--- a/src/smartput/smartput.c ++++ b/src/smartput/smartput.c +@@ -50,6 +50,8 @@ + #include + #include "smartput_options.h" + ++#include ++ + typedef struct _SmartputUndoInfo { + Window window; + +diff --git a/src/snow/snow.c b/src/snow/snow.c +index 80e94aa..fb6566a 100644 +--- a/src/snow/snow.c ++++ b/src/snow/snow.c +@@ -32,6 +32,8 @@ + #include + #include "snow_options.h" + ++#include ++ + #define GET_SNOW_DISPLAY(d) \ + ((SnowDisplay *) (d)->base.privates[displayPrivateIndex].ptr) + +diff --git a/src/snowglobe/snowglobe-internal.h b/src/snowglobe/snowglobe-internal.h +index 9ca51ff..f6d89af 100644 +--- a/src/snowglobe/snowglobe-internal.h ++++ b/src/snowglobe/snowglobe-internal.h +@@ -8,6 +8,7 @@ + + #include + #include ++#include + + /* some constants */ + #define PI M_PI +diff --git a/src/stars/star.c b/src/stars/star.c +index 96a26c1..59aa7d9 100644 +--- a/src/stars/star.c ++++ b/src/stars/star.c +@@ -43,6 +43,8 @@ + #include + #include "star_options.h" + ++#include ++ + #define GET_SNOW_DISPLAY(d) \ + ((SnowDisplay *) (d)->base.privates[displayPrivateIndex].ptr) + +diff --git a/src/tile/tile.c b/src/tile/tile.c +index d58cac5..98c0ad0 100644 +--- a/src/tile/tile.c ++++ b/src/tile/tile.c +@@ -30,6 +30,8 @@ + #include + #include "tile_options.h" + ++#include ++ + static int displayPrivateIndex = 0; + + typedef enum { +diff --git a/src/wizard/wizard.c b/src/wizard/wizard.c +index d60ff94..d90f9cc 100644 +--- a/src/wizard/wizard.c ++++ b/src/wizard/wizard.c +@@ -30,6 +30,8 @@ + #include "wizard_options.h" + #include "wizard_tex.h" + ++#include ++ + #define GET_WIZARD_DISPLAY(d) \ + ((WizardDisplay *) (d)->base.privates[displayPrivateIndex].ptr) + diff --git a/libraries/compiz-plugins-extra/compiz-plugins-extra.SlackBuild b/libraries/compiz-plugins-extra/compiz-plugins-extra.SlackBuild index baf64788ca1..bd933df6aed 100644 --- a/libraries/compiz-plugins-extra/compiz-plugins-extra.SlackBuild +++ b/libraries/compiz-plugins-extra/compiz-plugins-extra.SlackBuild @@ -79,6 +79,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/gcc13.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/compiz-plugins-extra/gcc13.patch b/libraries/compiz-plugins-extra/gcc13.patch new file mode 100644 index 00000000000..5500445b4b1 --- /dev/null +++ b/libraries/compiz-plugins-extra/gcc13.patch @@ -0,0 +1,203 @@ +https://bbs.archlinux.org/viewtopic.php?id=290483 + +diff --git a/src/addhelper/addhelper.c b/src/addhelper/addhelper.c +index 3bc8a6b..78242e9 100644 +--- a/src/addhelper/addhelper.c ++++ b/src/addhelper/addhelper.c +@@ -24,6 +24,9 @@ + */ + + #include ++ ++#include ++ + #include "addhelper_options.h" + + #define GET_ADD_DISPLAY(d) \ +diff --git a/src/bench/bench.c b/src/bench/bench.c +index 9cdef8c..4610021 100644 +--- a/src/bench/bench.c ++++ b/src/bench/bench.c +@@ -22,6 +22,8 @@ + + #include + ++#include ++ + #include "bench_tex.h" + #include "bench_options.h" + +diff --git a/src/firepaint/firepaint.c b/src/firepaint/firepaint.c +index b147b03..cb8a508 100644 +--- a/src/firepaint/firepaint.c ++++ b/src/firepaint/firepaint.c +@@ -21,6 +21,8 @@ + + #include + ++#include ++ + #include "firepaint_options.h" + #include "firepaint_tex.h" + +diff --git a/src/grid/grid.c b/src/grid/grid.c +index a8d5152..cb827e6 100644 +--- a/src/grid/grid.c ++++ b/src/grid/grid.c +@@ -23,7 +23,10 @@ + */ + + #include ++ ++#include + #include ++ + #include "grid_options.h" + + #define GRID_DEBUG 0 +diff --git a/src/highlightcontent/highlightcontent.c b/src/highlightcontent/highlightcontent.c +index 33bf932..5d66978 100644 +--- a/src/highlightcontent/highlightcontent.c ++++ b/src/highlightcontent/highlightcontent.c +@@ -21,6 +21,7 @@ + */ + + #include ++#include + #include + + #include +diff --git a/src/loginout/loginout.c b/src/loginout/loginout.c +index e2889d2..466f7df 100644 +--- a/src/loginout/loginout.c ++++ b/src/loginout/loginout.c +@@ -21,6 +21,8 @@ + + #include + ++#include ++ + #include "loginout_options.h" + + static int displayPrivateIndex = 0; +diff --git a/src/mblur/mblur.c b/src/mblur/mblur.c +index 103cd32..4e15c6d 100644 +--- a/src/mblur/mblur.c ++++ b/src/mblur/mblur.c +@@ -20,6 +20,7 @@ + */ + + #include ++#include + + #include + +diff --git a/src/reflex/reflex.c b/src/reflex/reflex.c +index 8c6ebc3..648c9c9 100644 +--- a/src/reflex/reflex.c ++++ b/src/reflex/reflex.c +@@ -20,6 +20,8 @@ + */ + #include + ++#include ++ + #include "reflex_options.h" + + +diff --git a/src/scalefilter/scalefilter.c b/src/scalefilter/scalefilter.c +index 55e2a96..c10c5d1 100644 +--- a/src/scalefilter/scalefilter.c ++++ b/src/scalefilter/scalefilter.c +@@ -25,6 +25,7 @@ + + #define _GNU_SOURCE + #include ++#include + #include + #include + #include +diff --git a/src/shelf/shelf.c b/src/shelf/shelf.c +index cd17839..e4fd09c 100644 +--- a/src/shelf/shelf.c ++++ b/src/shelf/shelf.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + #include + #include "shelf_options.h" + +diff --git a/src/showmouse/showmouse.c b/src/showmouse/showmouse.c +index fe972a2..32c3cb9 100644 +--- a/src/showmouse/showmouse.c ++++ b/src/showmouse/showmouse.c +@@ -25,6 +25,7 @@ + */ + + #include ++#include + #include + + #include +diff --git a/src/splash/splash.c b/src/splash/splash.c +index c72b9b0..986a3ec 100644 +--- a/src/splash/splash.c ++++ b/src/splash/splash.c +@@ -20,6 +20,7 @@ + */ + + #include ++#include + + #include + #include +diff --git a/src/trailfocus/trailfocus.c b/src/trailfocus/trailfocus.c +index ecfa84d..05c50f4 100644 +--- a/src/trailfocus/trailfocus.c ++++ b/src/trailfocus/trailfocus.c +@@ -25,6 +25,7 @@ + * + */ + ++#include + #include + #include + #include "trailfocus_options.h" +diff --git a/src/vidcap/vidcap.c b/src/vidcap/vidcap.c +index 10157b2..a08126d 100644 +--- a/src/vidcap/vidcap.c ++++ b/src/vidcap/vidcap.c +@@ -27,6 +27,7 @@ + + #define _GNU_SOURCE /* For asprintf */ + #include ++#include + #include + #include + #include +diff --git a/src/wallpaper/wallpaper.c b/src/wallpaper/wallpaper.c +index fd23b69..2c47fa7 100644 +--- a/src/wallpaper/wallpaper.c ++++ b/src/wallpaper/wallpaper.c +@@ -23,6 +23,7 @@ + */ + + #include ++#include + #include + #include + #include +diff --git a/src/widget/widget.c b/src/widget/widget.c +index ce7d4f0..6d146fa 100644 +--- a/src/widget/widget.c ++++ b/src/widget/widget.c +@@ -26,6 +26,7 @@ + * + */ + ++#include + #include + #include + #include diff --git a/libraries/dav1d/README b/libraries/dav1d/README deleted file mode 100644 index cf7b07d41ce..00000000000 --- a/libraries/dav1d/README +++ /dev/null @@ -1,7 +0,0 @@ -dav1d is an AV1 decoder being developed by the VideoLAN, -with the aim of creating a fast and correct decoder to -overcome the present lack of hardware AV1 decoders. - -This SlackBuild builds the binary decoder dav1d as well -as libraries suitable for use by other applications such -as FFmpeg and VLC. diff --git a/libraries/dav1d/dav1d.SlackBuild b/libraries/dav1d/dav1d.SlackBuild deleted file mode 100644 index 5bdc954e7b3..00000000000 --- a/libraries/dav1d/dav1d.SlackBuild +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/bash -# ---------------------------------------------------------------------- -# Slackware build script for dav1d -# -# Copyright (c) 2019-2024 Andrew Strong, Blue Mountains, Australia. -# Copyright 2024 Jeremy Hansen -# -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# ---------------------------------------------------------------------- - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=dav1d -VERSION=${VERSION:-1.4.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/$PRGNAM-$VERSION -cd $TMP -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 build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson setup .. \ - --buildtype=release \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --prefix=/usr - "${NINJA:=ninja}" - DESTDIR=$PKG $NINJA install -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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING NEWS *.md doc/PATENTS $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 diff --git a/libraries/dav1d/dav1d.info b/libraries/dav1d/dav1d.info deleted file mode 100644 index e387ef18dea..00000000000 --- a/libraries/dav1d/dav1d.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="dav1d" -VERSION="1.4.3" -HOMEPAGE="https://code.videolan.org/videolan/dav1d" -DOWNLOAD="https://code.videolan.org/videolan/dav1d/-/archive/1.4.3/dav1d-1.4.3.tar.gz" -MD5SUM="c6fd9302a28d8c8e41e9a658a2be2031" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Jeremy Hansen" -EMAIL="jebrhansen+SBo@gmail.com" diff --git a/libraries/dav1d/slack-desc b/libraries/dav1d/slack-desc deleted file mode 100644 index b9ef7d30796..00000000000 --- a/libraries/dav1d/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------------------------------------------------------| -dav1d: dav1d (AV1 decoder) -dav1d: -dav1d: dav1d is an AV1 decoder focused on speed and correctness. -dav1d: -dav1d: Homepage: https://code.videolan.org/videolan/dav1d -dav1d: -dav1d: -dav1d: -dav1d: -dav1d: -dav1d: diff --git a/libraries/ffms2/586d87de3f896d0c4ff01b21f572375e11f9c3f1.patch b/libraries/ffms2/586d87de3f896d0c4ff01b21f572375e11f9c3f1.patch deleted file mode 100644 index bae70e486eb..00000000000 --- a/libraries/ffms2/586d87de3f896d0c4ff01b21f572375e11f9c3f1.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 586d87de3f896d0c4ff01b21f572375e11f9c3f1 Mon Sep 17 00:00:00 2001 -From: Derek Buitenhuis -Date: Tue, 4 May 2021 14:20:47 +0100 -Subject: [PATCH] configure: Remove deprecated API use - -Signed-off-by: Derek Buitenhuis ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b35ef80bcd..d19714d0f6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -102,10 +102,10 @@ CFLAGS="$_CFLAGS $FFMPEG_CFLAGS" - - AC_DEFUN([TEST_FFMPEG], - [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -- #include -+ #include - #include - ]],[[ -- avcodec_register_all(); -+ avformat_network_init(); - swscale_version(); - ]])], [eval $1=yes], [eval $1=no]) - ]) diff --git a/libraries/ffms2/ffms2.SlackBuild b/libraries/ffms2/ffms2.SlackBuild index 433793dd716..69715d1d854 100644 --- a/libraries/ffms2/ffms2.SlackBuild +++ b/libraries/ffms2/ffms2.SlackBuild @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ffms2 -VERSION=${VERSION:-2.40} -BUILD=${BUILD:-3} +VERSION=${VERSION:-5.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -75,7 +75,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/586d87de3f896d0c4ff01b21f572375e11f9c3f1.patch mkdir -p src/config autoreconf -fiv CXXFLAGS="$SLKCFLAGS -fpermissive" \ diff --git a/libraries/ffms2/ffms2.info b/libraries/ffms2/ffms2.info index 307147c833e..a331fadc450 100644 --- a/libraries/ffms2/ffms2.info +++ b/libraries/ffms2/ffms2.info @@ -1,8 +1,8 @@ PRGNAM="ffms2" -VERSION="2.40" +VERSION="5.0" HOMEPAGE="https://github.com/FFMS/ffms2" -DOWNLOAD="https://github.com/FFMS/ffms2/archive/2.40/ffms2-2.40.tar.gz" -MD5SUM="141f194432d70bbf5456a847043f332a" +DOWNLOAD="https://github.com/FFMS/ffms2/archive/5.0/ffms2-5.0.tar.gz" +MD5SUM="c90259950777de3c429a78038a6a00a3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/flickcurl/flickcurl.SlackBuild b/libraries/flickcurl/flickcurl.SlackBuild index 4e2172fcb33..e2ebbedd960 100644 --- a/libraries/flickcurl/flickcurl.SlackBuild +++ b/libraries/flickcurl/flickcurl.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=flickcurl VERSION=${VERSION:-1.26} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -73,6 +73,7 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION +patch -p0 < $CWD/includes.patch chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/libraries/flickcurl/includes.patch b/libraries/flickcurl/includes.patch new file mode 100644 index 00000000000..9acc0642d3b --- /dev/null +++ b/libraries/flickcurl/includes.patch @@ -0,0 +1,275 @@ +diff -ur src.old/activity.c src/activity.c +--- src.old/activity.c 2024-10-13 11:42:59.998881132 +0900 ++++ src/activity.c 2024-10-13 11:44:49.745270696 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/args.c src/args.c +--- src.old/args.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/args.c 2024-10-13 11:48:38.331145970 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/blog.c src/blog.c +--- src.old/blog.c 2024-10-13 11:43:00.000881158 +0900 ++++ src/blog.c 2024-10-13 11:43:54.910577158 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/category.c src/category.c +--- src.old/category.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/category.c 2024-10-13 11:43:24.710194543 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/collection.c src/collection.c +--- src.old/collection.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/collection.c 2024-10-13 11:43:15.118072925 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/comments.c src/comments.c +--- src.old/comments.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/comments.c 2024-10-13 11:44:31.003033817 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/contacts.c src/contacts.c +--- src.old/contacts.c 2024-10-13 11:42:59.998881132 +0900 ++++ src/contacts.c 2024-10-13 11:45:19.570647295 +0900 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/context.c src/context.c +--- src.old/context.c 2024-10-13 11:43:00.000881158 +0900 ++++ src/context.c 2024-10-13 11:49:15.717613873 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/exif.c src/exif.c +--- src.old/exif.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/exif.c 2024-10-13 11:49:04.788477160 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/gallery.c src/gallery.c +--- src.old/gallery.c 2024-10-13 11:42:59.998881132 +0900 ++++ src/gallery.c 2024-10-13 11:48:54.363346699 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/group.c src/group.c +--- src.old/group.c 2024-10-13 11:42:59.998881132 +0900 ++++ src/group.c 2024-10-13 11:49:30.564799510 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/legacy-auth.c src/legacy-auth.c +--- src.old/legacy-auth.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/legacy-auth.c 2024-10-13 11:56:39.293976791 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/members.c src/members.c +--- src.old/members.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/members.c 2024-10-13 11:54:35.846594448 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/method.c src/method.c +--- src.old/method.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/method.c 2024-10-13 11:54:39.492639524 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/note.c src/note.c +--- src.old/note.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/note.c 2024-10-13 11:54:32.676555252 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/oauth.c src/oauth.c +--- src.old/oauth.c 2024-10-13 11:43:00.000881158 +0900 ++++ src/oauth.c 2024-10-13 11:56:34.588936076 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/perms.c src/perms.c +--- src.old/perms.c 2024-10-13 11:43:00.000881158 +0900 ++++ src/perms.c 2024-10-13 11:55:31.035276137 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/photo.c src/photo.c +--- src.old/photo.c 2024-10-13 11:42:59.998881132 +0900 ++++ src/photo.c 2024-10-13 11:54:25.302464059 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + + #ifdef HAVE_CONFIG_H +diff -ur src.old/photoset.c src/photoset.c +--- src.old/photoset.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/photoset.c 2024-10-13 11:54:28.555504292 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/sha1.c src/sha1.c +--- src.old/sha1.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/sha1.c 2024-10-13 11:56:51.346081132 +0900 +@@ -92,6 +92,7 @@ + #include + #include + #include ++#include + + #include + #include +diff -ur src.old/size.c src/size.c +--- src.old/size.c 2024-10-13 11:42:59.998881132 +0900 ++++ src/size.c 2024-10-13 11:54:16.726357972 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/stat.c src/stat.c +--- src.old/stat.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/stat.c 2024-10-13 11:54:09.052263016 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/tags.c src/tags.c +--- src.old/tags.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/tags.c 2024-10-13 11:53:55.022089347 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/ticket.c src/ticket.c +--- src.old/ticket.c 2024-10-13 11:42:59.999881145 +0900 ++++ src/ticket.c 2024-10-13 11:54:13.112313256 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +diff -ur src.old/user_upload_status.c src/user_upload_status.c +--- src.old/user_upload_status.c 2024-10-13 11:42:59.998881132 +0900 ++++ src/user_upload_status.c 2024-10-13 11:54:04.058201207 +0900 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include diff --git a/libraries/fmt/README b/libraries/fmt/README deleted file mode 100644 index aac25b63167..00000000000 --- a/libraries/fmt/README +++ /dev/null @@ -1,2 +0,0 @@ -{fmt} is an open-source formatting library for C++. It can be used as a -safe and fast alternative to (s)printf and iostreams. diff --git a/libraries/fmt/fmt.SlackBuild b/libraries/fmt/fmt.SlackBuild deleted file mode 100644 index bc2a0b642c4..00000000000 --- a/libraries/fmt/fmt.SlackBuild +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -# Slackware build script for fmt - -# Copyright 2022-2024 Steven Voges -# Copyright 2019-2021 Hunter Sezen California, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=fmt -VERSION=${VERSION:-10.2.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -eu - -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_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_SKIP_RPATH=TRUE \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a *.md 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 diff --git a/libraries/fmt/fmt.info b/libraries/fmt/fmt.info deleted file mode 100644 index 6942c4a7735..00000000000 --- a/libraries/fmt/fmt.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fmt" -VERSION="10.2.1" -HOMEPAGE="https://fmt.dev" -DOWNLOAD="https://github.com/fmtlib/fmt/archive/10.2.1/fmt-10.2.1.tar.gz" -MD5SUM="dc09168c94f90ea890257995f2c497a5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Steven Voges" -EMAIL="svoges.sbo@gmail.com" diff --git a/libraries/fmt/slack-desc b/libraries/fmt/slack-desc deleted file mode 100644 index 01b96bb24d6..00000000000 --- a/libraries/fmt/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------------------------------------------------------| -fmt: fmt (A modern formatting library) -fmt: -fmt: {fmt} is an open-source formatting library for C++. It can be used as -fmt: a safe and fast alternative to (s)printf and iostreams. -fmt: -fmt: Homepage: https://fmt.dev/ -fmt: -fmt: -fmt: -fmt: -fmt: diff --git a/libraries/ftgl/ftgl.SlackBuild b/libraries/ftgl/ftgl.SlackBuild index ce85294cb63..090ffdca234 100644 --- a/libraries/ftgl/ftgl.SlackBuild +++ b/libraries/ftgl/ftgl.SlackBuild @@ -84,7 +84,7 @@ DOCOPT="--disable-doc" [ "${DOCS:-no}" = "yes" ] && DOCOPT="--enable-doc" CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -std=gnu++11" \ +CXXFLAGS="$SLKCFLAGS -std=gnu++11 -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/gdl/gdl.SlackBuild b/libraries/gdl/gdl.SlackBuild index f59ee628ae4..707ad87ecdd 100644 --- a/libraries/gdl/gdl.SlackBuild +++ b/libraries/gdl/gdl.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gdl -VERSION=${VERSION:-3.34.0} -BUILD=${BUILD:-3} +VERSION=${VERSION:-3.40.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -83,7 +80,7 @@ find -L . \ # Don't create the __pycache__ directory. export PYTHONDONTWRITEBYTECODE=1 -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/libraries/gdl/gdl.info b/libraries/gdl/gdl.info index cadf2359c39..2b7af28d805 100644 --- a/libraries/gdl/gdl.info +++ b/libraries/gdl/gdl.info @@ -1,8 +1,8 @@ PRGNAM="gdl" -VERSION="3.34.0" +VERSION="3.40.0" HOMEPAGE="https://www.gnome.org/" -DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/gdl/3.34/gdl-3.34.0.tar.xz" -MD5SUM="d624f2ca85555402828d5c4a98912b82" +DOWNLOAD="https://download.gnome.org/sources/gdl/3.40/gdl-3.40.0.tar.xz" +MD5SUM="21df1254b49b74a498feb99be57364d0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/gevent/gevent.SlackBuild b/libraries/gevent/gevent.SlackBuild index 27094767a12..5dc78499edd 100644 --- a/libraries/gevent/gevent.SlackBuild +++ b/libraries/gevent/gevent.SlackBuild @@ -77,6 +77,9 @@ 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 {} \; +# https://github.com/gevent/gevent/issues/2031 +patch -p1 < $CWD/workaround-cython-bug.patch + python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/libraries/gevent/workaround-cython-bug.patch b/libraries/gevent/workaround-cython-bug.patch new file mode 100644 index 00000000000..3f90f65e724 --- /dev/null +++ b/libraries/gevent/workaround-cython-bug.patch @@ -0,0 +1,9 @@ +--- a/src/gevent/_gevent_cqueue.pxd ++++ b/src/gevent/_gevent_cqueue.pxd +@@ -75,7 +75,6 @@ cdef class ItemWaiter(Waiter): + cdef readonly Queue queue + + +-@cython.final + cdef class UnboundQueue(Queue): + pass diff --git a/libraries/gspell/README b/libraries/gspell/README deleted file mode 100644 index f36221777b5..00000000000 --- a/libraries/gspell/README +++ /dev/null @@ -1,4 +0,0 @@ -gspell (spell checking library for GTK+ applications) - -gspell provides a flexible API to add spell-checking to a GTK+ -application. diff --git a/libraries/gspell/gspell.SlackBuild b/libraries/gspell/gspell.SlackBuild deleted file mode 100644 index 5d79f30c6c6..00000000000 --- a/libraries/gspell/gspell.SlackBuild +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/bash - -# Slackware build script for gspell - -# Copyright 2021 Igor Alexandrov -# 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. - -# 20220422 bkw: Modified by SlackBuilds.org, BUILD=3: -# - fix PRINT_PACKAGE_NAME (PKGTYPE wasn't set). -# - remove useless ABOUT-NLS and INSTALL from doc dir. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=gspell -VERSION=${VERSION:-1.12.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$(uname -m) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -eu - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -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 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-debug \ - --disable-static \ - --enable-gtk-doc \ - --build=$ARCH-slackware-linux -make -make install DESTDIR=$PKG - -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 - -find $PKG -name '*.la' -delete - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog HACKING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -rm -f $PKG/usr/lib*/*.la - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/gspell/gspell.info b/libraries/gspell/gspell.info deleted file mode 100644 index b7765def4af..00000000000 --- a/libraries/gspell/gspell.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="gspell" -VERSION="1.12.1" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gspell" -DOWNLOAD="https://download.gnome.org/sources/gspell/1.12/gspell-1.12.1.tar.xz" -MD5SUM="6c1145a0d2a40c2266337a3975e0e8d5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Igor Alexandrov" -EMAIL="igor.alexandrov@outlook.com" diff --git a/libraries/gspell/slack-desc b/libraries/gspell/slack-desc deleted file mode 100644 index 63b73cefab1..00000000000 --- a/libraries/gspell/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 ':'. - - |-----handy-ruler------------------------------------------------------| -gspell: gspell (spell checking library for GTK+ applications) -gspell: -gspell: gspell provides a flexible API to add spell-checking to -gspell: a GTK+ application. -gspell: -gspell: More details: -gspell: https://gitlab.gnome.org/GNOME/gspell -gspell: -gspell: -gspell: -gspell: diff --git a/libraries/html5lib/README b/libraries/html5lib/README deleted file mode 100644 index 7e574380596..00000000000 --- a/libraries/html5lib/README +++ /dev/null @@ -1,5 +0,0 @@ -html5lib is a pure-python library for parsing HTML. It is designed to -conform to the WHATWG HTML specification, as is implemented by all -major web browsers. - -Optional dependencies: genshi and lxml diff --git a/libraries/html5lib/html5lib.SlackBuild b/libraries/html5lib/html5lib.SlackBuild deleted file mode 100644 index fa754e8b255..00000000000 --- a/libraries/html5lib/html5lib.SlackBuild +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -# Slackware build script for html5lib - -# Copyright 2023 Steven Voges -# Copyright 2017-2018 Larry Hajali -# Written by Šime Ramov -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=html5lib -VERSION=${VERSION:-1.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -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 {} \; - -python2 setup.py install --root=$PKG -python3 setup.py install --root=$PKG - -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 -cp -a \ - *.rst LICENSE PKG-INFO \ - $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 diff --git a/libraries/html5lib/html5lib.info b/libraries/html5lib/html5lib.info deleted file mode 100644 index 2640ea6836e..00000000000 --- a/libraries/html5lib/html5lib.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="html5lib" -VERSION="1.1" -HOMEPAGE="https://github.com/html5lib/html5lib-python" -DOWNLOAD="https://files.pythonhosted.org/packages/ac/b6/b55c3f49042f1df3dcd422b7f224f939892ee94f22abcf503a9b7339eaf2/html5lib-1.1.tar.gz" -MD5SUM="6748742e2ec4cb99287a6bc82bcfe2b0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-webencodings" -MAINTAINER="Steven Voges" -EMAIL="svoges.sbo@gmail.com" diff --git a/libraries/html5lib/slack-desc b/libraries/html5lib/slack-desc deleted file mode 100644 index e4a55d3a1d7..00000000000 --- a/libraries/html5lib/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------------------------------------------------------| -html5lib: html5lib (HTML parser based on the HTML5 specification) -html5lib: -html5lib: Standards-compliant library for parsing and serializing HTML documents -html5lib: and fragments in Python -html5lib: -html5lib: Homepage: https://github.com/html5lib/html5lib-python -html5lib: -html5lib: -html5lib: -html5lib: -html5lib: diff --git a/libraries/iniparser/README b/libraries/iniparser/README deleted file mode 100644 index f9cd6964183..00000000000 --- a/libraries/iniparser/README +++ /dev/null @@ -1,6 +0,0 @@ -Iniparser is a free stand-alone INI file parsing library. -It is written in portable ANSI C and should compile anywhere. - -WARNING: -This package will overwrite Samba's libiniparser.so -If you remove this package, don't forget to reinstall samba diff --git a/libraries/iniparser/iniparser.SlackBuild b/libraries/iniparser/iniparser.SlackBuild deleted file mode 100644 index 83ffb966924..00000000000 --- a/libraries/iniparser/iniparser.SlackBuild +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/bash - -# Slackware build script for Iniparser - -# Copyright 2017, Steven King -# 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. - -# 20220418 bkw: Modified by SlackBuilds.org, BUILD=2: -# - actually use SLKCFLAGS. -# - remove the static library. -# - fix the shared library so it actually works. -# - install the shared lib stripped. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=iniparser -VERSION=${VERSION:-4.0} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar vxf $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 {} \+ - -# 20220418 bkw: previous version of this script tried to fix the -rpath -# info in the shared library, but was broken. this works: -sed -i "s,/usr/lib,/usr/lib$LIBDIRSUFFIX," Makefile - -# 20220418 bkw: SLKCFLAGS weren't being used. -CFLAGS="$SLKCFLAGS" \ -CXFLAGS="$SLKCFLAGS" \ -make V=1 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} -mkdir -p $PKG/usr/include - -cp -ar AUTHORS LICENSE README.md html $PKG/usr/doc/$PRGNAM-$VERSION - -install -s -m0755 libiniparser.so.0 $PKG/usr/lib${LIBDIRSUFFIX} - -# 20220418 bkw: create the symlink gcc uses to link with this. -# previously, anything (such as cava) which linked with -# -liniparser was actually using the static library. -ln -s lib${PRGNAM}.so.0 $PKG/usr/lib$LIBDIRSUFFIX/lib${PRGNAM}.so - -cp -a ./src/dictionary.h ./src/iniparser.h $PKG/usr/include - -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 diff --git a/libraries/iniparser/iniparser.info b/libraries/iniparser/iniparser.info deleted file mode 100644 index de282c9c58f..00000000000 --- a/libraries/iniparser/iniparser.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="iniparser" -VERSION="4.0" -HOMEPAGE="https://github.com/ndevilla/iniparser" -DOWNLOAD="https://github.com/ndevilla/iniparser/archive/v4.0/iniparser-4.0.tar.gz" -MD5SUM="94c7278f8d22de1a31320219b27634b0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Steven King" -EMAIL="kingrst@gmail.com" diff --git a/libraries/iniparser/slack-desc b/libraries/iniparser/slack-desc deleted file mode 100644 index c410aaa7868..00000000000 --- a/libraries/iniparser/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------------------------------------------------------| -iniparser: iniparser (A free stand-alone INI file parsing library) -iniparser: -iniparser: It is written in portable ANSI C and should compile anywhere. -iniparser: Iniparser is distributed under an MIT license. -iniparser: -iniparser: Homepage: http://ndevilla.free.fr/iniparser -iniparser: -iniparser: -iniparser: -iniparser: -iniparser: diff --git a/libraries/keybinder/keybinder.SlackBuild b/libraries/keybinder/keybinder.SlackBuild index a0c586771df..4f4c77de0e4 100644 --- a/libraries/keybinder/keybinder.SlackBuild +++ b/libraries/keybinder/keybinder.SlackBuild @@ -91,6 +91,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-static \ --disable-python \ + --disable-lua \ --build=$ARCH-slackware-linux make diff --git a/libraries/kirigami-addons/README b/libraries/kirigami-addons/README deleted file mode 100644 index 117ddbb50f5..00000000000 --- a/libraries/kirigami-addons/README +++ /dev/null @@ -1,9 +0,0 @@ -kirigami-addons (Add-ons for the Kirigami framework) - -A set of "widgets" i.e visual end user components along with a code -to support them. Components are usable by both touch and desktop -experiences providing a native experience on both, and look native -with any QQC2 style (qqc2-desktop-theme, Material or Plasma). - -NOTE: This is the latest supported version for Slackware 15.0 unless -Plasma Framework is updated to 5.91 or higher. diff --git a/libraries/kirigami-addons/kirigami-addons.SlackBuild b/libraries/kirigami-addons/kirigami-addons.SlackBuild deleted file mode 100644 index 3baaad845f3..00000000000 --- a/libraries/kirigami-addons/kirigami-addons.SlackBuild +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/bash - -# Slackware build script for kirigami-addons - -# Copyright 2023 Jeremy Hansen -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=kirigami-addons -VERSION=${VERSION:-0.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -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_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DKDE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install/strip DESTDIR=$PKG -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -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 -cp -a \ - README.md \ - $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 diff --git a/libraries/kirigami-addons/kirigami-addons.info b/libraries/kirigami-addons/kirigami-addons.info deleted file mode 100644 index 49fdcc1d7bf..00000000000 --- a/libraries/kirigami-addons/kirigami-addons.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="kirigami-addons" -VERSION="0.2" -HOMEPAGE="https://invent.kde.org/libraries/kirigami-addons" -DOWNLOAD="https://github.com/KDE/kirigami-addons/archive/refs/tags/v0.2/kirigami-addons-0.2.tar.gz" -MD5SUM="aec5730a5cfe061912b8b302bbf33b03" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Jeremy Hansen" -EMAIL="jebrhansen+SBo@gmail.com" diff --git a/libraries/kirigami-addons/slack-desc b/libraries/kirigami-addons/slack-desc deleted file mode 100644 index a556548d727..00000000000 --- a/libraries/kirigami-addons/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------------------------------------------------------| -kirigami-addons: kirigami-addons (Add-ons for the Kirigami framework) -kirigami-addons: -kirigami-addons: A set of "widgets" i.e visual end user components along with a code -kirigami-addons: to support them. Components are usable by both touch and desktop -kirigami-addons: experiences providing a native experience on both, and look native -kirigami-addons: with any QQC2 style (qqc2-desktop-theme, Material or Plasma). -kirigami-addons: -kirigami-addons: HOMEPAGE: https://invent.kde.org/libraries/kirigami-addons -kirigami-addons: -kirigami-addons: -kirigami-addons: diff --git a/libraries/libadwaita/README b/libraries/libadwaita/README index 82c462be4e0..8627d67671f 100644 --- a/libraries/libadwaita/README +++ b/libraries/libadwaita/README @@ -6,26 +6,6 @@ GTK4 as well as the "Adwaita" theme, a coloring API, and a mechanism to make apps linked against it fit in with a system-wide dark mode preference. -NOTE: -This version of libadwaita for Slackware 15.0 has been patched to -support GTK 4.4. libadwaita upstream advertises its minimum version as -4.6, although it does not use any C API that is not provided by version -4.4. However, according to the libadwaita git logs, it libadwaita relies -on some fixes from GTK 4.6+ to work 100% correctly. I have found -libadwaita to work perfectly reasonably with GTK 4.4. Adding one patch -to suppress a CSS runtime warning, the only issue I have run into is -that some fonts may render as larger than the developers have intended, -and window widths and heights are slightly larger as well. - -As well, starting with libadwaita 1.2, more GObject properties are -starting to get used that only exist on GTK >= 4.6. I have patched out -one such usage that I have observed. However, continuing to patch -libadwaita will not be maintainable in the long run. For that reason, -libadwaita 1.2.x will be the end of the line for Slackware 15.0. - -If you wish to use libadwaita as fully intended by the developers, you -can build a local copy of GTK 4 >= 4.6 on your system. - Build options: BUILDTYPE => customize build type by setting to a value recognized by diff --git a/libraries/libadwaita/libadwaita-1.0.5-support-gtk-4.4.patch b/libraries/libadwaita/libadwaita-1.0.5-support-gtk-4.4.patch deleted file mode 100644 index e85ed58ca00..00000000000 --- a/libraries/libadwaita/libadwaita-1.0.5-support-gtk-4.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libadwaita-1.0.5/src/meson.build libadwaita-1.0.5.new/src/meson.build ---- libadwaita-1.0.5/src/meson.build 2022-06-01 06:48:47.000000000 -0400 -+++ libadwaita-1.0.5.new/src/meson.build 2022-06-13 22:37:56.670269324 -0400 -@@ -222,7 +222,7 @@ - ] - - glib_min_version = '>= 2.66' --gtk_min_version = '>= 4.5.0' -+gtk_min_version = '>= 4.4.0' - - gio_dep = dependency('gio-2.0', version: glib_min_version) - gtk_dep = dependency('gtk4', version: gtk_min_version) diff --git a/libraries/libadwaita/libadwaita-1.0.5-suppress-line-break-warnings.patch b/libraries/libadwaita/libadwaita-1.0.5-suppress-line-break-warnings.patch deleted file mode 100644 index c68e9cfb533..00000000000 --- a/libraries/libadwaita/libadwaita-1.0.5-suppress-line-break-warnings.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/stylesheet/widgets/_trees.scss b/src/stylesheet/widgets/_trees.scss -index 8b137968..a067bd4a 100644 ---- a/src/stylesheet/widgets/_trees.scss -+++ b/src/stylesheet/widgets/_trees.scss -@@ -73,7 +73,6 @@ treeview.view { - padding-bottom: 3px; - border-radius: 0; - box-shadow: none; -- line-height: 100%; - - > box { - color: gtkalpha(currentColor, if($contrast == 'high', .6, .4)); diff --git a/libraries/libadwaita/libadwaita-1.2.0-dont-use-titlebar-property.patch b/libraries/libadwaita/libadwaita-1.2.0-dont-use-titlebar-property.patch deleted file mode 100644 index 4b1f004b9ab..00000000000 --- a/libraries/libadwaita/libadwaita-1.2.0-dont-use-titlebar-property.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur libadwaita-1.2.0/src/adw-message-dialog.ui libadwaita-1.2.0.new/src/adw-message-dialog.ui ---- libadwaita-1.2.0/src/adw-message-dialog.ui 2022-09-14 20:41:34.000000000 -0400 -+++ libadwaita-1.2.0.new/src/adw-message-dialog.ui 2023-01-25 18:00:34.228428374 -0500 -@@ -5,11 +5,6 @@ - -- -- -- False -- -- - - - diff --git a/libraries/libadwaita/libadwaita.SlackBuild b/libraries/libadwaita/libadwaita.SlackBuild index 92e6e5de08f..90d7b0bc4be 100644 --- a/libraries/libadwaita/libadwaita.SlackBuild +++ b/libraries/libadwaita/libadwaita.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libadwaita -# Copyright © 2022-2023 Logan Rathbone, Province of Ontario, Canada +# Copyright © 2022-2024 Logan Rathbone, Province of Ontario, Canada # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libadwaita -VERSION=${VERSION:-1.2.5} +VERSION=${VERSION:-1.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -71,10 +71,6 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION -patch -p1 < $CWD/libadwaita-1.0.5-support-gtk-4.4.patch -patch -p1 < $CWD/libadwaita-1.0.5-suppress-line-break-warnings.patch -patch -p1 < $CWD/libadwaita-1.2.0-dont-use-titlebar-property.patch - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -84,7 +80,8 @@ find -L . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -meson \ +meson setup \ + --wrap-mode=nodownload \ --buildtype=${BUILDTYPE:-release} \ --infodir=/usr/info \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libadwaita/libadwaita.info b/libraries/libadwaita/libadwaita.info index e68d3b3ef31..293409b72a9 100644 --- a/libraries/libadwaita/libadwaita.info +++ b/libraries/libadwaita/libadwaita.info @@ -1,10 +1,10 @@ PRGNAM="libadwaita" -VERSION="1.2.5" +VERSION="1.6.1" HOMEPAGE="https://gitlab.gnome.org/GNOME/libadwaita" -DOWNLOAD="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/1.2.5/libadwaita-1.2.5.tar.gz" -MD5SUM="2036469b45424f2592248b628e3fccec" +DOWNLOAD="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/1.6.1/libadwaita-1.6.1.tar.gz" +MD5SUM="9d5e5dd89c76753c2189708a57a13526" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="AppStream" MAINTAINER="Logan Rathbone" EMAIL="poprocks@gmail.com" diff --git a/libraries/libass/README b/libraries/libass/README deleted file mode 100644 index b6a6558e40f..00000000000 --- a/libraries/libass/README +++ /dev/null @@ -1,5 +0,0 @@ -libass is a portable subtitle renderer for the ASS/SSA (Advanced -Substation Alpha/Substation Alpha) subtitle format. It is mostly -compatible with VSFilter. - -enca and libunibreak are optional dependencies. diff --git a/libraries/libass/libass.SlackBuild b/libraries/libass/libass.SlackBuild deleted file mode 100644 index 10f64bd7daf..00000000000 --- a/libraries/libass/libass.SlackBuild +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/bash - -# Slackware build script for libass - -# Written by Larry Hajali -# Copyright 2011-2023 Matteo Bernardini , Pisa, Italy -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libass -VERSION=${VERSION:-0.17.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -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 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-static=no \ - --disable-silent-rules \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la - -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 -cp -a Changelog COPYING $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 diff --git a/libraries/libass/libass.info b/libraries/libass/libass.info deleted file mode 100644 index 34d42d17e80..00000000000 --- a/libraries/libass/libass.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libass" -VERSION="0.17.1" -HOMEPAGE="https://github.com/libass/libass" -DOWNLOAD="https://github.com/libass/libass/releases/download/0.17.1/libass-0.17.1.tar.xz" -MD5SUM="73f00a898161be424e05d4bee1962dbb" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/libraries/libass/slack-desc b/libraries/libass/slack-desc deleted file mode 100644 index d64a3d90f22..00000000000 --- a/libraries/libass/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------------------------------------------------------| -libass: libass (Subtitle renderer for the ASS/SSA) -libass: -libass: libass is a portable subtitle renderer for the ASS/SSA (Advanced -libass: Substation Alpha/Substation Alpha) subtitle format. It is mostly -libass: compatible with VSFilter. -libass: -libass: Homepage: http://code.google.com/p/libass/ -libass: -libass: -libass: -libass: diff --git a/libraries/libcryptui/libcryptui.SlackBuild b/libraries/libcryptui/libcryptui.SlackBuild index a09faec62bb..3be093b102b 100644 --- a/libraries/libcryptui/libcryptui.SlackBuild +++ b/libraries/libcryptui/libcryptui.SlackBuild @@ -83,6 +83,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# https://reviews.freebsd.org/R11:6a0795e +sed -i 's|"1.2 1.4 2.0"|"1.2 1.4 2.0 2.1 2.2 2.3 2.4"|g' configure + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/libcuefile/libcuefile.SlackBuild b/libraries/libcuefile/libcuefile.SlackBuild index eded3fa9d88..43aa6f7a455 100644 --- a/libraries/libcuefile/libcuefile.SlackBuild +++ b/libraries/libcuefile/libcuefile.SlackBuild @@ -65,7 +65,7 @@ echo 'INSTALL(FILES ${libcuefile_SOURCE_DIR}/include/cuetools/cuefile.h ${libcue cmake \ -G "Unix Makefiles" \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -fpermissive" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/libraries/libdispatch/libdispatch.SlackBuild b/libraries/libdispatch/libdispatch.SlackBuild index a856400a2b5..a23f419f998 100644 --- a/libraries/libdispatch/libdispatch.SlackBuild +++ b/libraries/libdispatch/libdispatch.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libdispatch -VERSION=${VERSION:-5.3} +VERSION=${VERSION:-5.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/libdispatch/libdispatch.info b/libraries/libdispatch/libdispatch.info index 093ad12ad4e..ef5494940b8 100644 --- a/libraries/libdispatch/libdispatch.info +++ b/libraries/libdispatch/libdispatch.info @@ -1,8 +1,8 @@ PRGNAM="libdispatch" -VERSION="5.3" +VERSION="5.5" HOMEPAGE="https://apple.github.io/swift-corelibs-libdispatch/" -DOWNLOAD="https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.3-RELEASE/swift-corelibs-libdispatch-swift-5.3-RELEASE.tar.gz" -MD5SUM="6ab94f19f3b29fe1970fd8471109f184" +DOWNLOAD="https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.5-RELEASE/swift-corelibs-libdispatch-swift-5.5-RELEASE.tar.gz" +MD5SUM="865c9d5225e29cbeebb903faa5e29a2c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libev/README b/libraries/libev/README deleted file mode 100644 index f7826e9dd53..00000000000 --- a/libraries/libev/README +++ /dev/null @@ -1,12 +0,0 @@ -libev (a high-performance event loop/model) - -Libev is modelled (very loosely) after libevent and the Event perl -module, but is faster, scales better and is more correct, and also -more featureful. And also smaller. Yay. - -Note: libev and libevent both have a usr/include/event.h -header file. This could have lead to compile problems if both -packages were installed at the same time, so it has been moved to -usr/include/libev/event.h. Add CPPFLAGS="-I/usr/include/libev" to -the SlackBuild if the software you're building over this needs the -libevent compatibility layer (lighttpd2 and i3 don't). diff --git a/libraries/libev/libev.SlackBuild b/libraries/libev/libev.SlackBuild deleted file mode 100644 index 0baf104e88b..00000000000 --- a/libraries/libev/libev.SlackBuild +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/bash - -# Slackware build script for libev - -# Written by Šime Ramov -# Maintained (2012-2020) by Matteo Bernardini , Pisa, Italy - -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libev -VERSION=${VERSION:-4.33} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -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 {} \; - -# Force CFLAGS -sed -i "s|-g -O3|$SLKCFLAGS|" configure || exit 1 - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --enable-static=no \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la - -# avoid conflicting with libevent, we move an header in a subfolder -# and we will explicitly add CPPFLAGS="-I/usr/include/libev" when -# building software depending on this, if needed: lighttpd2 and i3, -# for example, don't need this header. -mkdir -p $PKG/usr/include/libev -mv $PKG/usr/include/event.h $PKG/usr/include/libev/ - -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 - -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 README LICENSE Changes $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 diff --git a/libraries/libev/libev.info b/libraries/libev/libev.info deleted file mode 100644 index a603f1c17c2..00000000000 --- a/libraries/libev/libev.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libev" -VERSION="4.33" -HOMEPAGE="http://software.schmorp.de/pkg/libev.html" -DOWNLOAD="http://dist.schmorp.de/libev/Attic/libev-4.33.tar.gz" -MD5SUM="a3433f23583167081bf4acdd5b01b34f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/libraries/libev/slack-desc b/libraries/libev/slack-desc deleted file mode 100644 index 67d4ce48e73..00000000000 --- a/libraries/libev/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------------------------------------------------------| -libev: libev (a high-performance event loop/model) -libev: -libev: Libev is modelled (very loosely) after libevent and the Event perl -libev: module, but is faster, scales better and is more correct, and also -libev: more featureful. And also smaller. Yay. -libev: -libev: Website: -libev: -libev: -libev: -libev: diff --git a/libraries/libfm-extra/libfm-extra.SlackBuild b/libraries/libfm-extra/libfm-extra.SlackBuild index 482e5e68068..b480d20381f 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-2021 Matteo Bernardini , Pisa, Italy +# Copyright 2014-2024 Matteo Bernardini , Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libfm-extra SRCNAM=libfm -VERSION=${VERSION:-1.3.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20230916_5346a53} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -80,6 +77,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 {} \; +./autogen.sh || true + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/libfm-extra/libfm-extra.info b/libraries/libfm-extra/libfm-extra.info index 1ca4ae995d7..e0fb17706b5 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.2" +VERSION="20230916_5346a53" HOMEPAGE="https://wiki.lxde.org/en/Libfm" -DOWNLOAD="https://downloads.sf.net/pcmanfm/libfm-1.3.2.tar.xz" -MD5SUM="c87a0ff41ae77825079b2f785ec0741e" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/libfm-20230916_5346a53.tar.xz" +MD5SUM="9c32dde43dda170979358eea298ba10e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libfm/gcc14.patch b/libraries/libfm/gcc14.patch new file mode 100644 index 00000000000..c04fd53cc02 --- /dev/null +++ b/libraries/libfm/gcc14.patch @@ -0,0 +1,55 @@ +From ec6a21263d150aea918826941a80f335b45470a8 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Fri, 1 Mar 2024 14:19:46 +0900 +Subject: [PATCH] FIX: support gcc14 -Werror=incompatible-pointer-types + +gcc14 now defaults to -Werror=incompatible-pointer-types . +To support this, cast GTK related objects for assignment +properly. + +Fixes #100 . +--- + src/gtk/exo/exo-icon-view.c | 2 +- + src/gtk/fm-dnd-dest.c | 2 +- + src/gtk/fm-standard-view.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/gtk/exo/exo-icon-view.c b/src/gtk/exo/exo-icon-view.c +index 3ce98099..79e1c7ab 100644 +--- a/src/gtk/exo/exo-icon-view.c ++++ b/src/gtk/exo/exo-icon-view.c +@@ -2819,7 +2819,7 @@ exo_icon_view_key_press_event (GtkWidget *widget, + /* allocate a new event to forward */ + new_event = gdk_event_copy ((GdkEvent *) event); + g_object_unref (G_OBJECT (new_event->key.window)); +- new_event->key.window = g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry))); ++ new_event->key.window = GDK_WINDOW(g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry)))); + + /* send the event to the search entry. If the "preedit-changed" signal is + * emitted during this event, priv->search_imcontext_changed will be set. +diff --git a/src/gtk/fm-dnd-dest.c b/src/gtk/fm-dnd-dest.c +index 95d310d3..ce752758 100644 +--- a/src/gtk/fm-dnd-dest.c ++++ b/src/gtk/fm-dnd-dest.c +@@ -458,7 +458,7 @@ static GdkDragAction _ask_action_on_drop(GtkWidget *widget, + gtk_action_set_sensitive(act, FALSE); + } + } +- ri.menu = g_object_ref(gtk_ui_manager_get_widget(ui, "/popup")); ++ ri.menu = GTK_MENU(g_object_ref(gtk_ui_manager_get_widget(ui, "/popup"))); + g_signal_connect(ri.menu, "selection-done", G_CALLBACK(gtk_widget_destroy), NULL); + unmap_handler = g_signal_connect(ri.menu, "unmap", + G_CALLBACK(run_unmap_handler), &ri); +diff --git a/src/gtk/fm-standard-view.c b/src/gtk/fm-standard-view.c +index e0ff5a06..df920254 100644 +--- a/src/gtk/fm-standard-view.c ++++ b/src/gtk/fm-standard-view.c +@@ -637,7 +637,7 @@ static inline void create_icon_view(FmStandardView* fv, GList* sels) + "text", FM_FOLDER_MODEL_COL_NAME ); + if(fv->renderer_text) + g_object_unref(fv->renderer_text); +- fv->renderer_text = g_object_ref_sink(render); ++ fv->renderer_text = FM_CELL_RENDERER_TEXT(g_object_ref_sink(render)); + exo_icon_view_set_search_column((ExoIconView*)fv->view, FM_FOLDER_MODEL_COL_NAME); + g_signal_connect(fv->view, "item-activated", G_CALLBACK(on_icon_view_item_activated), fv); + g_signal_connect(fv->view, "selection-changed", G_CALLBACK(on_sel_changed), fv); diff --git a/libraries/libfm/libfm.SlackBuild b/libraries/libfm/libfm.SlackBuild index 99a22733f4b..1cd6e3da539 100644 --- a/libraries/libfm/libfm.SlackBuild +++ b/libraries/libfm/libfm.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libfm -VERSION=${VERSION:-1.3.2} -BUILD=${BUILD:-3} +VERSION=${VERSION:-20230916_5346a53} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -83,6 +83,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/gcc14.patch + NOCONFIGURE=1 sh autogen.sh || true CFLAGS="$SLKCFLAGS" \ diff --git a/libraries/libfm/libfm.info b/libraries/libfm/libfm.info index 33d95cb239e..54af9b127a5 100644 --- a/libraries/libfm/libfm.info +++ b/libraries/libfm/libfm.info @@ -1,8 +1,8 @@ PRGNAM="libfm" -VERSION="1.3.2" +VERSION="20230916_5346a53" HOMEPAGE="https://wiki.lxde.org/en/Libfm" -DOWNLOAD="https://downloads.sf.net/pcmanfm/libfm-1.3.2.tar.xz" -MD5SUM="c87a0ff41ae77825079b2f785ec0741e" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/libfm-20230916_5346a53.tar.xz" +MD5SUM="9c32dde43dda170979358eea298ba10e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lxmenu-data menu-cache" diff --git a/libraries/libglpng/libglpng.SlackBuild b/libraries/libglpng/libglpng.SlackBuild index 80bd940a77a..1a458d45d2e 100644 --- a/libraries/libglpng/libglpng.SlackBuild +++ b/libraries/libglpng/libglpng.SlackBuild @@ -82,7 +82,7 @@ find -L . \ patch -p1 < $CWD/libglpng-1.45-extra_cflags.patch patch -p1 < $CWD/libglpng-1.45-libpng15.patch -make EXTRA_CFLAGS="$SLKCFLAGS" +make EXTRA_CFLAGS="$SLKCFLAGS -fpermissive" make install DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG/usr # The Makefile doesn't make this easy :/ diff --git a/libraries/libhandy/README b/libraries/libhandy/README deleted file mode 100644 index b2c80e46610..00000000000 --- a/libraries/libhandy/README +++ /dev/null @@ -1,4 +0,0 @@ -libhandy (additional UI components for gtk+3) - -The aim of the Handy library is to help with developing UI for mobile -devices using GTK/GNOME. diff --git a/libraries/libhandy/libhandy.SlackBuild b/libraries/libhandy/libhandy.SlackBuild deleted file mode 100644 index ed273f8ad01..00000000000 --- a/libraries/libhandy/libhandy.SlackBuild +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -# Slackware build script for libhandy - -# Written by B. Watson (urchlay@slackware.uk) - -# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. - -# 20240729 bkw: updated for v1.8.3. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libhandy -VERSION=${VERSION:-1.8.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ - -mkdir build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson .. \ - --buildtype=release \ - --infodir=/usr/info \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --mandir=/usr/man \ - --prefix=/usr \ - --sysconfdir=/etc \ - -Dgtk_doc=true \ - -Dstrip=true - "${NINJA:=ninja}" - DESTDIR=$PKG $NINJA install -cd .. - -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING NEWS *.md $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 diff --git a/libraries/libhandy/libhandy.info b/libraries/libhandy/libhandy.info deleted file mode 100644 index 1cc6225d795..00000000000 --- a/libraries/libhandy/libhandy.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libhandy" -VERSION="1.8.3" -HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/" -DOWNLOAD="https://download.gnome.org/sources/libhandy/1.8/libhandy-1.8.3.tar.xz" -MD5SUM="af586a91ff6d4093a6e7e283dfab5f7f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="gi-docgen" -MAINTAINER="B. Watson" -EMAIL="urchlay@slackware.uk" diff --git a/libraries/libhandy/slack-desc b/libraries/libhandy/slack-desc deleted file mode 100644 index 303f0b2f7db..00000000000 --- a/libraries/libhandy/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------------------------------------------------------| -libhandy: libhandy (additional UI components for gtk+3) -libhandy: -libhandy: The aim of the Handy library is to help with developing UI for mobile -libhandy: devices using GTK/GNOME. -libhandy: -libhandy: -libhandy: -libhandy: -libhandy: -libhandy: -libhandy: diff --git a/libraries/libindi/README b/libraries/libindi/README deleted file mode 100644 index c04391240f7..00000000000 --- a/libraries/libindi/README +++ /dev/null @@ -1,16 +0,0 @@ -INDI is a distributed control protocol designed to operate -astronomical instrumentation. INDI is small, flexible, easy to parse, -and scalable. It supports common DCS functions such as remote -control, data acquisition, monitoring, and a lot more. - -This script builds the library that KDE KStars and similar programs -can use for image capture in astrophotography, telescope control, etc. - -rtl-sdr is optional to enable Realtek RTL2832 DVB dongle as a SDR -receiver (available on SBo). There may be additional optional -dependencies. - -Supported hardware devices: http://indilib.org/devices/ -You will need libindi-drivers (also on SBo) to fully utilize some -third party hardware. Refer to indi-{libraries,drivers} on SBo for -optional hardware requirements and dependencies. diff --git a/libraries/libindi/doinst.sh b/libraries/libindi/doinst.sh deleted file mode 100644 index 47e1cb12cb4..00000000000 --- a/libraries/libindi/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -x /sbin/udevadm ]; then - /sbin/udevadm control --reload-rules >/dev/null 2>&1 && /sbin/udevadm trigger >/dev/null 2>&1 -fi diff --git a/libraries/libindi/libindi.SlackBuild b/libraries/libindi/libindi.SlackBuild deleted file mode 100644 index dd927245cb0..00000000000 --- a/libraries/libindi/libindi.SlackBuild +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash - -# Slackware build script for libindi - -# Copyright 2018, 2022 Edward W. Koenig, Vancouver, WA, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libindi -VERSION=${VERSION:-2.0.6} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -SRCNAM=indi - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$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 {} \+ - -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" -export LDFLAGS="-lbz2" -mkdir -p build -cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DINCLUDE_INSTALL_DIR=/usr/include \ - -DUDEVRULES_INSTALL_DIR=/lib/udev/rules.d \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING.* INSTALL LICENSE README \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/doinst.sh > $PKG/install/doinst.sh -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libindi/libindi.info b/libraries/libindi/libindi.info deleted file mode 100644 index 3ae80bc03af..00000000000 --- a/libraries/libindi/libindi.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libindi" -VERSION="2.0.6" -HOMEPAGE="https://www.indilib.org/" -DOWNLOAD="https://github.com/indilib/indi/archive/v2.0.6/indi-2.0.6.tar.gz" -MD5SUM="7ecc7c944743089ad9da35b0602de589" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libnova libev" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@linuxgalaxy.org" diff --git a/libraries/libindi/slack-desc b/libraries/libindi/slack-desc deleted file mode 100644 index c8394dc76ef..00000000000 --- a/libraries/libindi/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------------------------------------------------------| -libindi: libindi (Instrument Neutral Distributed Interface) -libindi: -libindi: INDI is a distributed control protocol designed to operate -libindi: astronomical instrumentation. INDI is small, flexible, easy to parse, -libindi: and scalable. It supports common DCS functions such as remote control, -libindi: data acquisition, monitoring, and a lot more. -libindi: -libindi: https://www.indilib.org/ -libindi: -libindi: -libindi: diff --git a/libraries/libiptcdata/libiptcdata.SlackBuild b/libraries/libiptcdata/libiptcdata.SlackBuild index b825e340f8f..7eedbc9e1ab 100644 --- a/libraries/libiptcdata/libiptcdata.SlackBuild +++ b/libraries/libiptcdata/libiptcdata.SlackBuild @@ -32,8 +32,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libiptcdata -VERSION=${VERSION:-1.0.4} -BUILD=${BUILD:-4} +VERSION=${VERSION:-1.0.5} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/libiptcdata/libiptcdata.info b/libraries/libiptcdata/libiptcdata.info index 1059a4dc964..c8fb736c211 100644 --- a/libraries/libiptcdata/libiptcdata.info +++ b/libraries/libiptcdata/libiptcdata.info @@ -1,8 +1,8 @@ PRGNAM="libiptcdata" -VERSION="1.0.4" +VERSION="1.0.5" HOMEPAGE="http://libiptcdata.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/libiptcdata/libiptcdata-1.0.4.tar.gz" -MD5SUM="af886556ecb129b694f2d365d03d95a8" +DOWNLOAD="https://github.com/ianw/libiptcdata/releases/download/release_1_0_5/libiptcdata-1.0.5.tar.gz" +MD5SUM="c04bc1375c280d41c0106255d1df711a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/liblangtag/liblangtag.SlackBuild b/libraries/liblangtag/liblangtag.SlackBuild index aebe04d1bb9..1d9bf5fbb92 100644 --- a/libraries/liblangtag/liblangtag.SlackBuild +++ b/libraries/liblangtag/liblangtag.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=liblangtag -VERSION=${VERSION:-0.6.4} +VERSION=${VERSION:-0.6.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/liblangtag/liblangtag.info b/libraries/liblangtag/liblangtag.info index e71d19aa7f5..2e7d3645aa6 100644 --- a/libraries/liblangtag/liblangtag.info +++ b/libraries/liblangtag/liblangtag.info @@ -1,8 +1,8 @@ PRGNAM="liblangtag" -VERSION="0.6.4" +VERSION="0.6.7" HOMEPAGE="https://bitbucket.org/tagoh/liblangtag/wiki/Home" -DOWNLOAD="https://bitbucket.org/tagoh/liblangtag/downloads/liblangtag-0.6.4.tar.bz2" -MD5SUM="c93611c472b5875166b4a3a35a66a62d" +DOWNLOAD="https://bitbucket.org/tagoh/liblangtag/downloads/liblangtag-0.6.7.tar.bz2" +MD5SUM="5876517621f06944d9abda15508b8183" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libnfs/libnfs.SlackBuild b/libraries/libnfs/libnfs.SlackBuild index 6fb9590a50b..2c8d7632203 100644 --- a/libraries/libnfs/libnfs.SlackBuild +++ b/libraries/libnfs/libnfs.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libnfs -VERSION=${VERSION:-5.0.2} +VERSION=${VERSION:-5.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/libnfs/libnfs.info b/libraries/libnfs/libnfs.info index e375612ac3b..51a446bbd24 100644 --- a/libraries/libnfs/libnfs.info +++ b/libraries/libnfs/libnfs.info @@ -1,8 +1,8 @@ PRGNAM="libnfs" -VERSION="5.0.2" +VERSION="5.0.3" HOMEPAGE="https://github.com/sahlberg/libnfs" -DOWNLOAD="https://github.com/sahlberg/libnfs/archive/libnfs-5.0.2/libnfs-libnfs-5.0.2.tar.gz" -MD5SUM="115034aab322d05235a9555d057f8b14" +DOWNLOAD="https://github.com/sahlberg/libnfs/archive/libnfs-5.0.3/libnfs-libnfs-5.0.3.tar.gz" +MD5SUM="27318b6192c960f440415d3284663162" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libnova/README b/libraries/libnova/README deleted file mode 100644 index de58ecb423a..00000000000 --- a/libraries/libnova/README +++ /dev/null @@ -1,7 +0,0 @@ -libnova is a general purpose, double precision, celestial mechanics, -astrometry, and astrodynamics library. It is the calculation engine -used by the Nova project. - -The intended audience of libnova are C / C++ programmers, astronomers -and anyone else interested in calculating positions of astronomical -objects or celestial mechanics. diff --git a/libraries/libnova/libnova.SlackBuild b/libraries/libnova/libnova.SlackBuild deleted file mode 100644 index 0dcecdbb403..00000000000 --- a/libraries/libnova/libnova.SlackBuild +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/bash - -# Slackware build script for libnova - -# Copyright 2013 Chris Abela -# Copyright 2014 Ryan P.C. McQuen -# Copyright 2017 Philip Lacroix -# -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libnova -VERSION=${VERSION:-0.15.0} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -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 {} \; - -autoreconf -vif - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make -C doc doc -make install DESTDIR=$PKG -rm -rf examples/.{deps,libs} - -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 - -cp -a doc/man $PKG/usr/man -rm -f $PKG/usr/man/man3/_tmp*.3 -rm -f $PKG/usr/man/man3/version.3 # This conflicts with the Slackware perl package -find $PKG/usr/man -type f -exec gzip -9 {} \; - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README doc/html examples \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -rm -f $PKG/usr/lib*/*.la - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libnova/libnova.info b/libraries/libnova/libnova.info deleted file mode 100644 index 5268ed8a905..00000000000 --- a/libraries/libnova/libnova.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libnova" -VERSION="0.15.0" -HOMEPAGE="http://libnova.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/libnova/libnova-0.15.0.tar.gz" -MD5SUM="756fdb55745cb78511f83a62c25f3be4" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Philip Lacroix" -EMAIL="slackph at posteo dot de" diff --git a/libraries/libnova/slack-desc b/libraries/libnova/slack-desc deleted file mode 100644 index ea5d1c0b894..00000000000 --- a/libraries/libnova/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------------------------------------------------------| -libnova: libnova (celestial mechanics, astrometry and astrodynamics library) -libnova: -libnova: libnova is a general purpose, double precision, celestial mechanics, -libnova: astrometry, and astrodynamics library. It is the calculation engine -libnova: used by the Nova project. -libnova: -libnova: The intended audience of libnova are C / C++ programmers, astronomers -libnova: and anyone else interested in calculating positions of astronomical -libnova: objects or celestial mechanics. -libnova: -libnova: Homepage: http://libnova.sourceforge.net/ diff --git a/libraries/liboauth/liboauth.SlackBuild b/libraries/liboauth/liboauth.SlackBuild index 38893e0d552..6b87307bd24 100644 --- a/libraries/liboauth/liboauth.SlackBuild +++ b/libraries/liboauth/liboauth.SlackBuild @@ -104,7 +104,7 @@ patch -p1 < $CWD/liboauth-1.0.3-openssl-1.1.0-2.patch # compile in clean dir mkdir -v build cd build -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" \ CXXFLAGS="$SLKCFLAGS" \ ../configure \ ${OPTS} \ diff --git a/libraries/libosinfo/libosinfo.SlackBuild b/libraries/libosinfo/libosinfo.SlackBuild index 6617cc6a619..554d88da227 100644 --- a/libraries/libosinfo/libosinfo.SlackBuild +++ b/libraries/libosinfo/libosinfo.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libosinfo -# Copyright 2014-2023 Matteo Bernardini , Pisa, Italy +# Copyright 2014-2024 Matteo Bernardini , Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libosinfo -VERSION=${VERSION:-1.10.0} +VERSION=${VERSION:-1.11.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/libosinfo/libosinfo.info b/libraries/libosinfo/libosinfo.info index 95389ddec14..7cc62742546 100644 --- a/libraries/libosinfo/libosinfo.info +++ b/libraries/libosinfo/libosinfo.info @@ -1,8 +1,8 @@ PRGNAM="libosinfo" -VERSION="1.10.0" +VERSION="1.11.0" HOMEPAGE="http://libosinfo.org" -DOWNLOAD="https://releases.pagure.org/libosinfo/libosinfo-1.10.0.tar.xz" -MD5SUM="9c2059648bf6f5610ba838a1fb1a84ad" +DOWNLOAD="https://releases.pagure.org/libosinfo/libosinfo-1.11.0.tar.xz" +MD5SUM="e7e586c0dd61aa73deff7fbe86473d64" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="osinfo-db" diff --git a/libraries/libpst/libpst.SlackBuild b/libraries/libpst/libpst.SlackBuild index f02b91fcd1c..65c4e55007d 100644 --- a/libraries/libpst/libpst.SlackBuild +++ b/libraries/libpst/libpst.SlackBuild @@ -99,58 +99,26 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -buildit() { - autoreconf -if - - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - ./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --enable-dii \ - --disable-static \ - --enable-libpst-shared \ - --enable-python \ - --build=$ARCH-slackware-linux - - make - # ./configure options --docdir and --htmldir have no effect, - # it is necessary to override "htmldir" and "htmldeveldir" - make install-strip DESTDIR=$PKG \ - htmldir=/usr/doc/$PRGNAM-$VERSION \ - htmldeveldir=/usr/doc/$PRGNAM-$VERSION/devel -} - -# 20211019 bkw: python3 builds work now. Include support for both -# python versions, 2 and 3. Unfortunately this means building the -# entire project twice (keeping only the python2 stuff from the -# first build). autotools doesn't make it easy or even necessarily -# possible to build only part of a project :( - -# Python 2 build. If python2 ever really does go away, this code will -# silently omit python2 support from the package. -if type -p python2 &>/dev/null; then - PY2VER="$( python2 --version 2>&1 | cut -d' ' -f2 | cut -d. -f1,2 )" - - # ./configure --help claims that I can set PYTHON_VERSION in the environment - # and it'll use that, but it doesn't work. So I have to use this abomination: - sed -i.bak 's,\,python'$PY2VER',g' m4/ax_python.m4 - - buildit - - mv $PKG/usr/lib$LIBDIRSUFFIX/python$PY2VER $PKG/.keep.python2 - rm -rf $PKG/* - - # put everything back the way it was. - make distclean - mv m4/ax_python.m4.bak m4/ax_python.m4 -fi - -# Python 3 build -buildit -[ -e $PKG/.keep.python2 ] && \ - mv $PKG/.keep.python2 $PKG/usr/lib$LIBDIRSUFFIX/python$PY2VER +autoreconf -if + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --enable-dii \ + --disable-static \ + --enable-libpst-shared \ + --enable-python \ + --build=$ARCH-slackware-linux + +make +# ./configure options --docdir and --htmldir have no effect, +# it is necessary to override "htmldir" and "htmldeveldir" +make install-strip DESTDIR=$PKG \ + htmldir=/usr/doc/$PRGNAM-$VERSION \ + htmldeveldir=/usr/doc/$PRGNAM-$VERSION/devel gzip -9 $PKG/usr/man/man?/*.? diff --git a/libraries/libquicktime/libquicktime-1.2.4-ffmpeg2.patch b/libraries/libquicktime/libquicktime-1.2.4-ffmpeg2.patch deleted file mode 100644 index 7add44220a2..00000000000 --- a/libraries/libquicktime/libquicktime-1.2.4-ffmpeg2.patch +++ /dev/null @@ -1,98 +0,0 @@ -Extracted from upstream CVS. -https://bugs.gentoo.org/show_bug.cgi?id=476498 - -Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c -@@ -45,6 +45,11 @@ - #define ENCODE_AUDIO 1 - #endif - -+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE -+/* from libavcodec/avcodec.h dated Dec 23 2012 */ -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio -+#endif -+ - /* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */ - - /* MPEG Audio header parsing code */ -Index: libquicktime-1.2.4/plugins/ffmpeg/params.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c -+++ libquicktime-1.2.4/plugins/ffmpeg/params.c -@@ -101,6 +101,17 @@ typedef struct - } \ - } - -+#define PARAM_DICT_INT(name, dict_name) \ -+ { \ -+ if(!strcasecmp(name, key)) \ -+ { \ -+ char buf[128]; \ -+ snprintf(buf, sizeof(buf), "%d", *(int*)value); \ -+ av_dict_set(options, dict_name, buf, 0); \ -+ found = 1; \ -+ } \ -+ } -+ - #define PARAM_DICT_FLAG(name, dict_name) \ - { \ - if(!strcasecmp(name, key)) \ -@@ -202,8 +213,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT("ff_max_b_frames",max_b_frames); - PARAM_FLOAT("ff_b_quant_factor",b_quant_factor); - PARAM_INT("ff_b_frame_strategy",b_frame_strategy); -+ -+#if LIBAVCODEC_VERSION_MAJOR >= 55 -+ PARAM_DICT_INT("ff_luma_elim_threshold","luma_elim_threshold"); -+ PARAM_DICT_INT("ff_chroma_elim_threshold","chroma_elim_threshold"); -+#else - PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold); - PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold); -+#endif -+ - PARAM_INT("ff_strict_std_compliance",strict_std_compliance); - PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset); - PARAM_INT("ff_rc_min_rate",rc_min_rate); -@@ -241,8 +259,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_QP2LAMBDA("ff_lmax", lmax); - PARAM_INT("ff_noise_reduction",noise_reduction); - PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); -+ -+#if LIBAVCODEC_VERSION_MAJOR >= 55 -+ PARAM_DICT_INT("ff_inter_threshold","inter_threshold"); -+ PARAM_DICT_INT("ff_quantizer_noise_shaping","quantizer_noise_shaping"); -+#else - PARAM_INT("ff_inter_threshold",inter_threshold); - PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping); -+#endif -+ - PARAM_INT("ff_thread_count",thread_count); - PARAM_INT("ff_me_threshold",me_threshold); - PARAM_INT("ff_mb_threshold",mb_threshold); -@@ -272,8 +297,16 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT); - PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED); - // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused -+ -+#if LIBAVCODEC_VERSION_MAJOR >= 55 -+ PARAM_DICT_FLAG("ff_flag_cbp_rd","cbp_rd"); -+ PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd"); -+ PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop"); -+#else - PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD); - PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD); -+ PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); -+#endif - - #if LIBAVCODEC_VERSION_MAJOR >= 54 - PARAM_DICT_FLAG("ff_flag_h263p_aiv", "aiv"); -@@ -288,7 +321,6 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER); - PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP); - PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST); -- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); - PARAM_ENUM("ff_coder_type",coder_type,coder_type); - - } diff --git a/libraries/libquicktime/libquicktime-1.2.4-ffmpeg4.patch b/libraries/libquicktime/libquicktime-1.2.4-ffmpeg4.patch deleted file mode 100644 index eb196ea16ae..00000000000 --- a/libraries/libquicktime/libquicktime-1.2.4-ffmpeg4.patch +++ /dev/null @@ -1,342 +0,0 @@ -Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c -@@ -545,7 +545,7 @@ static int decode_chunk_vbr(quicktime_t - - #if DECODE_AUDIO3 || DECODE_AUDIO4 - codec->pkt.data = codec->chunk_buffer; -- codec->pkt.size = packet_size + FF_INPUT_BUFFER_PADDING_SIZE; -+ codec->pkt.size = packet_size + AV_INPUT_BUFFER_PADDING_SIZE; - - #if DECODE_AUDIO4 - frame_bytes = avcodec_decode_audio4(codec->avctx, &f, -@@ -583,7 +583,7 @@ static int decode_chunk_vbr(quicktime_t - (codec->sample_buffer_end - codec->sample_buffer_start)], - &bytes_decoded, - codec->chunk_buffer, -- packet_size + FF_INPUT_BUFFER_PADDING_SIZE); -+ packet_size + AV_INPUT_BUFFER_PADDING_SIZE); - if(frame_bytes < 0) - { - lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "avcodec_decode_audio2 error"); -@@ -645,13 +645,13 @@ static int decode_chunk(quicktime_t * fi - return 0; - } - -- if(codec->chunk_buffer_alloc < mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE) -+ if(codec->chunk_buffer_alloc < mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE) - { -- codec->chunk_buffer_alloc = mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE; -+ codec->chunk_buffer_alloc = mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE; - codec->chunk_buffer = realloc(codec->chunk_buffer, codec->chunk_buffer_alloc); - } - memset(codec->chunk_buffer + codec->bytes_in_chunk_buffer, 0, -- mph.frame_bytes - codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE); -+ mph.frame_bytes - codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE); - num_samples = mph.samples_per_frame; - codec->bytes_in_chunk_buffer = mph.frame_bytes; - } -@@ -695,7 +695,7 @@ static int decode_chunk(quicktime_t * fi - { - - -- /* BIG NOTE: We pass extra FF_INPUT_BUFFER_PADDING_SIZE for the buffer size -+ /* BIG NOTE: We pass extra AV_INPUT_BUFFER_PADDING_SIZE for the buffer size - because we know, that lqt_read_audio_chunk allocates 16 extra bytes for us */ - - /* Some really broken mp3 files have the header bytes split across 2 chunks */ -@@ -761,7 +761,7 @@ static int decode_chunk(quicktime_t * fi - - #if DECODE_AUDIO3 || DECODE_AUDIO4 - codec->pkt.data = &codec->chunk_buffer[bytes_used]; -- codec->pkt.size = codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE; -+ codec->pkt.size = codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE; - - #if DECODE_AUDIO4 - -@@ -798,7 +798,7 @@ static int decode_chunk(quicktime_t * fi - (codec->sample_buffer_end - codec->sample_buffer_start)], - &bytes_decoded, - &codec->chunk_buffer[bytes_used], -- codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE); -+ codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE); - #endif - if(frame_bytes < 0) - { -@@ -838,7 +838,7 @@ static int decode_chunk(quicktime_t * fi - } - } - -- /* This happens because ffmpeg adds FF_INPUT_BUFFER_PADDING_SIZE to the bytes returned */ -+ /* This happens because ffmpeg adds AV_INPUT_BUFFER_PADDING_SIZE to the bytes returned */ - - if(codec->bytes_in_chunk_buffer < 0) - codec->bytes_in_chunk_buffer = 0; -Index: libquicktime-1.2.4/plugins/ffmpeg/params.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c -+++ libquicktime-1.2.4/plugins/ffmpeg/params.c -@@ -124,16 +124,6 @@ typedef struct - } - - --enum_t me_method[] = -- { -- { "Zero", ME_ZERO }, -- { "Phods", ME_PHODS }, -- { "Log", ME_LOG }, -- { "X1", ME_X1 }, -- { "Epzs", ME_EPZS }, -- { "Full", ME_FULL } -- }; -- - enum_t prediction_method[] = - { - { "Left", FF_PRED_LEFT }, -@@ -163,15 +153,6 @@ enum_t mb_decision[] = - { "Rate distoration", FF_MB_DECISION_RD } - }; - --enum_t coder_type[] = -- { -- { "VLC", FF_CODER_TYPE_VLC }, -- { "Arithmetic", FF_CODER_TYPE_AC }, -- { "Raw", FF_CODER_TYPE_RAW }, -- { "RLE", FF_CODER_TYPE_RLE }, -- { "Deflate", FF_CODER_TYPE_DEFLATE }, -- }; -- - #define PARAM_ENUM(name, var, arr) \ - if(!strcasecmp(key, name)) \ - { \ -@@ -203,7 +184,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT_SCALE("ff_bit_rate_audio",bit_rate,1000); - PARAM_INT_SCALE("ff_bit_rate_video",bit_rate,1000); - PARAM_INT_SCALE("ff_bit_rate_tolerance",bit_rate_tolerance,1000); -- PARAM_ENUM("ff_me_method",me_method,me_method); -+ PARAM_DICT_INT("ff_me_method","motion-est"); - PARAM_INT("ff_gop_size",gop_size); - PARAM_FLOAT("ff_qcompress",qcompress); - PARAM_FLOAT("ff_qblur",qblur); -@@ -227,10 +208,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT("ff_rc_min_rate",rc_min_rate); - PARAM_INT("ff_rc_max_rate",rc_max_rate); - PARAM_INT_SCALE("ff_rc_buffer_size",rc_buffer_size,1000); -- PARAM_FLOAT("ff_rc_buffer_aggressivity",rc_buffer_aggressivity); - PARAM_FLOAT("ff_i_quant_factor",i_quant_factor); - PARAM_QP2LAMBDA("ff_i_quant_offset",i_quant_offset); -- PARAM_FLOAT("ff_rc_initial_cplx",rc_initial_cplx); -+ PARAM_DICT_INT("ff_rc_initial_cplx","rc_init_cplx"); - PARAM_FLOAT("ff_lumi_masking",lumi_masking); - PARAM_FLOAT("ff_temporal_cplx_masking",temporal_cplx_masking); - PARAM_FLOAT("ff_spatial_cplx_masking",spatial_cplx_masking); -@@ -255,8 +235,8 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT("ff_me_range",me_range); - PARAM_ENUM("ff_mb_decision",mb_decision,mb_decision); - PARAM_INT("ff_scenechange_threshold",scenechange_threshold); -- PARAM_QP2LAMBDA("ff_lmin", lmin); -- PARAM_QP2LAMBDA("ff_lmax", lmax); -+ PARAM_DICT_INT("ff_lmin", "lmin"); -+ PARAM_DICT_INT("ff_lmax", "lmax"); - PARAM_INT("ff_noise_reduction",noise_reduction); - PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); - -@@ -269,33 +249,29 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - #endif - - PARAM_INT("ff_thread_count",thread_count); -- PARAM_INT("ff_me_threshold",me_threshold); -- PARAM_INT("ff_mb_threshold",mb_threshold); - PARAM_INT("ff_nsse_weight",nsse_weight); -- PARAM_FLOAT("ff_border_masking",border_masking); -+ PARAM_DICT_INT("ff_border_masking","border_mask"); - PARAM_QP2LAMBDA("ff_mb_lmin", mb_lmin); - PARAM_QP2LAMBDA("ff_mb_lmax", mb_lmax); - PARAM_INT("ff_me_penalty_compensation",me_penalty_compensation); - PARAM_INT("ff_bidir_refine",bidir_refine); - PARAM_INT("ff_brd_scale",brd_scale); -- PARAM_INT("ff_scenechange_factor",scenechange_factor); -- PARAM_FLAG("ff_flag_qscale",CODEC_FLAG_QSCALE); -- PARAM_FLAG("ff_flag_4mv",CODEC_FLAG_4MV); -- PARAM_FLAG("ff_flag_qpel",CODEC_FLAG_QPEL); -- PARAM_FLAG("ff_flag_gmc",CODEC_FLAG_GMC); -- PARAM_FLAG("ff_flag_mv0",CODEC_FLAG_MV0); -+ PARAM_FLAG("ff_flag_qscale",AV_CODEC_FLAG_QSCALE); -+ PARAM_FLAG("ff_flag_4mv",AV_CODEC_FLAG_4MV); -+ PARAM_FLAG("ff_flag_qpel",AV_CODEC_FLAG_QPEL); -+ PARAM_DICT_FLAG("ff_flag_gmc","gmc"); -+ PARAM_DICT_FLAG("ff_flag_mv0","mpv_flags"); - // PARAM_FLAG("ff_flag_part",CODEC_FLAG_PART); // Unused -- PARAM_FLAG("ff_flag_gray",CODEC_FLAG_GRAY); -- PARAM_FLAG("ff_flag_emu_edge",CODEC_FLAG_EMU_EDGE); -- PARAM_FLAG("ff_flag_normalize_aqp",CODEC_FLAG_NORMALIZE_AQP); -+ PARAM_FLAG("ff_flag_gray",AV_CODEC_FLAG_GRAY); -+ PARAM_DICT_FLAG("ff_flag_normalize_aqp","naq"); - // PARAM_FLAG("ff_flag_alt_scan",CODEC_FLAG_ALT_SCAN); // Unused - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - PARAM_FLAG("ff_flag_trellis_quant",CODEC_FLAG_TRELLIS_QUANT); - #else - PARAM_INT("ff_trellis",trellis); - #endif -- PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT); -- PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED); -+ PARAM_FLAG("ff_flag_bitexact",AV_CODEC_FLAG_BITEXACT); -+ PARAM_FLAG("ff_flag_ac_pred",AV_CODEC_FLAG_AC_PRED); - // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused - - #if LIBAVCODEC_VERSION_MAJOR >= 55 -@@ -303,9 +279,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd"); - PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop"); - #else -- PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD); -- PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD); -- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); -+ PARAM_FLAG("ff_flag_cbp_rd",AV_CODEC_FLAG_CBP_RD); -+ PARAM_FLAG("ff_flag_qp_rd",AV_CODEC_FLAG_QP_RD); -+ PARAM_FLAG2("ff_flag2_strict_gop",AV_CODEC_FLAG2_STRICT_GOP); - #endif - - #if LIBAVCODEC_VERSION_MAJOR >= 54 -@@ -313,14 +289,14 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_DICT_FLAG("ff_flag_obmc","obmc"); - PARAM_DICT_FLAG("ff_flag_h263p_slice_struct","structured_slices"); - #else -- PARAM_FLAG("ff_flag_h263p_aiv",CODEC_FLAG_H263P_AIV); -- PARAM_FLAG("ff_flag_obmc",CODEC_FLAG_OBMC); -- PARAM_FLAG("ff_flag_h263p_slice_struct",CODEC_FLAG_H263P_SLICE_STRUCT); -+ PARAM_FLAG("ff_flag_h263p_aiv",AV_CODEC_FLAG_H263P_AIV); -+ PARAM_FLAG("ff_flag_obmc",AV_CODEC_FLAG_OBMC); -+ PARAM_FLAG("ff_flag_h263p_slice_struct",AV_CODEC_FLAG_H263P_SLICE_STRUCT); - #endif - -- PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER); -- PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP); -- PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST); -- PARAM_ENUM("ff_coder_type",coder_type,coder_type); -+ PARAM_FLAG("ff_flag_loop_filter",AV_CODEC_FLAG_LOOP_FILTER); -+ PARAM_FLAG("ff_flag_closed_gop",AV_CODEC_FLAG_CLOSED_GOP); -+ PARAM_FLAG2("ff_flag2_fast",AV_CODEC_FLAG2_FAST); -+ PARAM_DICT_INT("ff_coder_type","coder"); - - } -Index: libquicktime-1.2.4/plugins/ffmpeg/params.h -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.h -+++ libquicktime-1.2.4/plugins/ffmpeg/params.h -@@ -149,7 +149,7 @@ the reference. Unused for constant quant - .type = LQT_PARAMETER_INT, \ - .val_default = { .val_int = 0 }, \ - .val_min = { .val_int = 0 }, \ -- .val_max = { .val_int = FF_MAX_B_FRAMES }, \ -+ .val_max = { .val_int = 16 }, \ - .help_string = TRS("Maximum number of B-frames between non B-frames") \ - } - -Index: libquicktime-1.2.4/plugins/ffmpeg/video.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c -+++ libquicktime-1.2.4/plugins/ffmpeg/video.c -@@ -781,7 +781,7 @@ static int lqt_ffmpeg_decode_video(quick - if(extradata) - { - codec->extradata = -- calloc(1, extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); -+ calloc(1, extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); - memcpy(codec->extradata, extradata, extradata_size); - codec->avctx->extradata_size = extradata_size; - codec->avctx->extradata = codec->extradata; -@@ -1140,8 +1140,8 @@ static int init_imx_encoder(quicktime_t - codec->avctx->qmin = 1; - codec->avctx->qmax = 3; - codec->avctx->rtp_payload_size = 1; // ?? -- codec->avctx->rc_buffer_aggressivity = 0.25; -- codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_LOW_DELAY; -+ av_dict_set(&codec->options, "rc_buf_aggressivity", "0.25", 0); -+ codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_LOW_DELAY; - - #if (LIBAVCODEC_VERSION_MAJOR < 54) - codec->avctx->flags2 |= CODEC_FLAG2_INTRA_VLC|CODEC_FLAG2_NON_LINEAR_QUANT; -@@ -1328,7 +1328,7 @@ static int lqt_ffmpeg_encode_video(quick - // codec->avctx->time_base.den = 1; - // codec->avctx->time_base.num = lqt_video_time_scale(file, track); - -- if(codec->avctx->flags & CODEC_FLAG_QSCALE) -+ if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE) - codec->avctx->global_quality = codec->qscale; - - codec->avctx->width = width; -@@ -1344,7 +1344,7 @@ static int lqt_ffmpeg_encode_video(quick - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -- codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - codec->write_global_header = 1; - } - -@@ -1360,7 +1360,7 @@ static int lqt_ffmpeg_encode_video(quick - { - lqt_log(file, LQT_LOG_INFO, LOG_DOMAIN, "Enabling interlaced encoding"); - codec->avctx->flags |= -- (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN); -+ (AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_INTERLACED_ME|AV_CODEC_FLAG_ALT_SCAN); - } - #endif - } -@@ -1387,7 +1387,7 @@ static int lqt_ffmpeg_encode_video(quick - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -- codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - codec->write_global_header = 1; - } - } -@@ -1410,7 +1410,7 @@ static int lqt_ffmpeg_encode_video(quick - { - if(vtrack->interlace_mode != LQT_INTERLACE_NONE) - { -- codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT; -+ codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT; - } - } - else if(codec->is_imx) -@@ -1422,7 +1422,7 @@ static int lqt_ffmpeg_encode_video(quick - if(codec->pass == 1) - { - codec->stats_file = fopen(codec->stats_filename, "w"); -- codec->avctx->flags |= CODEC_FLAG_PASS1; -+ codec->avctx->flags |= AV_CODEC_FLAG_PASS1; - } - else if(codec->pass == codec->total_passes) - { -@@ -1438,7 +1438,7 @@ static int lqt_ffmpeg_encode_video(quick - fclose(codec->stats_file); - codec->stats_file = (FILE*)0; - -- codec->avctx->flags |= CODEC_FLAG_PASS2; -+ codec->avctx->flags |= AV_CODEC_FLAG_PASS2; - } - } - /* Open codec */ -@@ -1516,7 +1516,7 @@ static int lqt_ffmpeg_encode_video(quick - } - - codec->frame->pts = vtrack->timestamp; -- if(codec->avctx->flags & CODEC_FLAG_QSCALE) -+ if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE) - codec->frame->quality = codec->qscale; - #ifdef DO_INTERLACE - if(vtrack->interlace_mode != LQT_INTERLACE_NONE) -@@ -1599,8 +1599,7 @@ static int lqt_ffmpeg_encode_video(quick - else if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - int advanced = 0; -- if(codec->avctx->max_b_frames || -- (codec->avctx->flags & (CODEC_FLAG_QPEL|CODEC_FLAG_GMC))) -+ if(codec->avctx->max_b_frames) - advanced = 1; - - setup_header_mpeg4(file, track, codec->avctx->extradata, diff --git a/libraries/libquicktime/libquicktime-ffmpeg3.patch b/libraries/libquicktime/libquicktime-ffmpeg3.patch deleted file mode 100644 index f5784e8229b..00000000000 --- a/libraries/libquicktime/libquicktime-ffmpeg3.patch +++ /dev/null @@ -1,935 +0,0 @@ -Index: libquicktime-1.2.4/plugins/ffmpeg/video.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c -+++ libquicktime-1.2.4/plugins/ffmpeg/video.c -@@ -37,10 +37,10 @@ - #endif - - --#ifdef PIX_FMT_YUV422P10 --#define PIX_FMT_YUV422P10_OR_DUMMY PIX_FMT_YUV422P10 -+#ifdef AV_PIX_FMT_YUV422P10 -+#define AV_PIX_FMT_YUV422P10_OR_DUMMY AV_PIX_FMT_YUV422P10 - #else --#define PIX_FMT_YUV422P10_OR_DUMMY -1234 -+#define AV_PIX_FMT_YUV422P10_OR_DUMMY -1234 - #endif - - #if LIBAVCODEC_VERSION_INT >= ((54<<16)|(1<<8)|0) -@@ -90,9 +90,9 @@ typedef struct - int imx_bitrate; - int imx_strip_vbi; - -- /* In some cases FFMpeg would report something like PIX_FMT_YUV422P, while -- we would like to treat it as PIX_FMT_YUVJ422P. It's only used for decoding */ -- enum PixelFormat reinterpret_pix_fmt; -+ /* In some cases FFMpeg would report something like AV_PIX_FMT_YUV422P, while -+ we would like to treat it as AV_PIX_FMT_YUVJ422P. It's only used for decoding */ -+ enum AVPixelFormat reinterpret_pix_fmt; - - int is_imx; - int y_offset; -@@ -137,42 +137,42 @@ typedef struct - - static const struct - { -- enum PixelFormat ffmpeg_id; -+ enum AVPixelFormat ffmpeg_id; - int lqt_id; - int exact; - } - colormodels[] = - { -- { PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) -+ { AV_PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) - #if LIBAVUTIL_VERSION_INT < (50<<16) -- { PIX_FMT_YUV422, BC_YUV422, 1 }, -+ { AV_PIX_FMT_YUV422, BC_YUV422, 1 }, - #else -- { PIX_FMT_YUYV422, BC_YUV422, 1 }, -+ { AV_PIX_FMT_YUYV422, BC_YUV422, 1 }, - #endif -- { PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... -- { PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... -- { PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -- { PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) -- { PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) -- { PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) --#ifdef PIX_FMT_YUV422P10 -- { PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 --#endif -- { PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness -- { PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) -- { PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) -- { PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) -+ { AV_PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... -+ { AV_PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... -+ { AV_PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -+ { AV_PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) -+ { AV_PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) -+ { AV_PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -+#ifdef AV_PIX_FMT_YUV422P10 -+ { AV_PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 -+#endif -+ { AV_PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness -+ { AV_PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) -+ { AV_PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) -+ { AV_PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) - #if LIBAVUTIL_VERSION_INT < (50<<16) -- { PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... -+ { AV_PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... - #else -- { PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... -+ { AV_PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... - #endif -- { PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 -- { PIX_FMT_GRAY8, BC_RGB888, 0 }, -- { PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white -- { PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black -- { PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette -- { PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) -+ { AV_PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 -+ { AV_PIX_FMT_GRAY8, BC_RGB888, 0 }, -+ { AV_PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white -+ { AV_PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black -+ { AV_PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette -+ { AV_PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) - }; - - static const struct -@@ -343,16 +343,16 @@ static int lqt_tenbit_dnxhd_supported(AV - if (!codec->pix_fmts) - return 0; - -- for (i = 0; codec->pix_fmts[i] != PIX_FMT_NONE; ++i) -+ for (i = 0; codec->pix_fmts[i] != AV_PIX_FMT_NONE; ++i) - { -- if (codec->pix_fmts[i] == PIX_FMT_YUV422P10_OR_DUMMY) -+ if (codec->pix_fmts[i] == AV_PIX_FMT_YUV422P10_OR_DUMMY) - return 1; - } - - return 0; - } - --static enum PixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) -+static enum AVPixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) - { - int i; - -@@ -361,10 +361,10 @@ static enum PixelFormat lqt_ffmpeg_get_f - if(colormodels[i].lqt_id == id) - return colormodels[i].ffmpeg_id; - } -- return PIX_FMT_NB; -+ return AV_PIX_FMT_NB; - } - --static int lqt_ffmpeg_get_lqt_colormodel(enum PixelFormat id, int * exact) -+static int lqt_ffmpeg_get_lqt_colormodel(enum AVPixelFormat id, int * exact) - { - int i; - -@@ -402,24 +402,24 @@ static void lqt_ffmpeg_setup_decoding_co - /* First we try codec-specific colormodel matching. */ - if(codec->decoder->id == AV_CODEC_ID_DNXHD) - { -- /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which -- we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */ -- if (codec->avctx->pix_fmt == PIX_FMT_YUV422P || codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY) -+ /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which -+ we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */ -+ if (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P || codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY) - { -- int p10 = (codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY); -+ int p10 = (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY); - *exact = 1; - if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE) - { - vtrack->stream_cmodel = p10 ? BC_YUVJ422P10 : BC_YUVJ422P; -- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUVJ422P; -- // Note: reinterpret_pix_fmt should really be PIX_FMT_YUVJ422P10, except -+ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUVJ422P; -+ // Note: reinterpret_pix_fmt should really be AV_PIX_FMT_YUVJ422P10, except - // there is no such colormodel in FFMpeg. Fortunately, it's not a problem - // in this case, as reinterpret_pix_fmt is only used when *exact == 0. - } - else - { - vtrack->stream_cmodel = p10 ? BC_YUV422P10 : BC_YUV422P; -- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUV422P; -+ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUV422P; - } - return; - } -@@ -440,14 +440,14 @@ static void lqt_ffmpeg_setup_encoding_co - - if (codec->encoder->id == AV_CODEC_ID_DNXHD) - { -- /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 -- and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10 -+ /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 -+ and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10 - (in fact, the latter doesn't even exist) */ -- codec->avctx->pix_fmt = PIX_FMT_YUV422P; -+ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P; - if (vtrack->stream_cmodel == BC_YUV422P10 || vtrack->stream_cmodel == BC_YUVJ422P10) - { - if (lqt_tenbit_dnxhd_supported(codec->encoder)) -- codec->avctx->pix_fmt = PIX_FMT_YUV422P10_OR_DUMMY; -+ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P10_OR_DUMMY; - } - } - } -@@ -458,7 +458,7 @@ static void lqt_ffmpeg_setup_encoding_co - /* From avcodec.h: */ - - /* -- * PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA -+ * AV_PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA - * color is put together as: - * (A << 24) | (R << 16) | (G << 8) | B - * This is stored as BGRA on little endian CPU architectures and ARGB on -@@ -530,7 +530,7 @@ static void convert_rgba_to_argb(uint8_t - */ - - static void convert_image_decode(quicktime_ffmpeg_video_codec_t *codec, -- AVFrame * in_frame, enum PixelFormat in_format, -+ AVFrame * in_frame, enum AVPixelFormat in_format, - unsigned char ** out_frame, int out_format, - int width, int height, int row_span, int row_span_uv) - { -@@ -547,9 +547,9 @@ static void convert_image_decode(quickti - * RGBA format like in ffmpeg?? - */ - #if LIBAVUTIL_VERSION_INT < (50<<16) -- if((in_format == PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) -+ if((in_format == AV_PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) - #else -- if((in_format == PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) -+ if((in_format == AV_PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) - #endif - { - convert_image_decode_rgba(in_frame, out_frame, width, height, codec->y_offset); -@@ -829,7 +829,7 @@ static int lqt_ffmpeg_decode_video(quick - if(avcodec_open2(codec->avctx, codec->decoder, NULL) != 0) - return -1; - #endif -- codec->frame = avcodec_alloc_frame(); -+ codec->frame = av_frame_alloc(); - vtrack->stream_cmodel = LQT_COLORMODEL_NONE; - codec->initialized = 1; - } -@@ -929,10 +929,10 @@ static int lqt_ffmpeg_decode_video(quick - #ifdef HAVE_LIBSWSCALE - - #if LIBAVUTIL_VERSION_INT < (50<<16) -- if(!((codec->avctx->pix_fmt == PIX_FMT_RGBA32) && -+ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGBA32) && - (vtrack->stream_cmodel == BC_RGBA8888))) - #else -- if(!((codec->avctx->pix_fmt == PIX_FMT_RGB32) && -+ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGB32) && - (vtrack->stream_cmodel == BC_RGBA8888))) - #endif - { -@@ -1318,7 +1318,7 @@ static int lqt_ffmpeg_encode_video(quick - - if(!codec->initialized) - { -- codec->frame = avcodec_alloc_frame(); -+ codec->frame = av_frame_alloc(); - - /* time_base is 1/framerate for constant framerate */ - -@@ -1396,9 +1396,9 @@ static int lqt_ffmpeg_encode_video(quick - if(vtrack->stream_cmodel == BC_RGBA8888) - { - /* Libquicktime doesn't natively support a color model equivalent -- to PIX_FMT_ARGB, which is required for QTRLE with alpha channel. -+ to AV_PIX_FMT_ARGB, which is required for QTRLE with alpha channel. - So, we use BC_RGBA8888 and do ad hoc conversion below. */ -- codec->avctx->pix_fmt = PIX_FMT_ARGB; -+ codec->avctx->pix_fmt = AV_PIX_FMT_ARGB; - vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; - } - } -@@ -1467,7 +1467,7 @@ static int lqt_ffmpeg_encode_video(quick - } - // codec->lqt_colormodel = ffmepg_2_lqt(codec->com.ffcodec_enc); - -- if(codec->y_offset != 0 || codec->avctx->pix_fmt == PIX_FMT_ARGB) -+ if(codec->y_offset != 0 || codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) - { - if(!codec->tmp_rows) - { -@@ -1492,7 +1492,7 @@ static int lqt_ffmpeg_encode_video(quick - vtrack->stream_cmodel, - 0, 0, 0, codec->y_offset); - } -- else if(codec->avctx->pix_fmt == PIX_FMT_ARGB) -+ else if(codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) - { - convert_rgba_to_argb(row_pointers[0], vtrack->stream_row_span, - codec->tmp_rows[0], codec->tmp_row_span, -Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c -@@ -1266,7 +1266,7 @@ static int lqt_ffmpeg_encode_audio(quick - pkt.data = codec->chunk_buffer; - pkt.size = codec->chunk_buffer_alloc; - -- avcodec_get_frame_defaults(&f); -+ av_frame_unref(&f); - f.nb_samples = codec->avctx->frame_size; - - avcodec_fill_audio_frame(&f, channels, codec->avctx->sample_fmt, ---- libquicktime-1.2.4/plugins/ffmpeg/lqt_ffmpeg.c.orig 2016-02-17 08:11:50.683023612 +0000 -+++ libquicktime-1.2.4/plugins/ffmpeg/lqt_ffmpeg.c 2016-02-17 08:12:20.362898974 +0000 -@@ -370,7 +370,7 @@ - struct CODECIDMAP codecidmap_v[] = - { - { -- .id = CODEC_ID_MPEG1VIDEO, -+ .id = AV_CODEC_ID_MPEG1VIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -381,7 +381,7 @@ - .wav_ids = { LQT_WAV_ID_NONE } - }, - { -- .id = CODEC_ID_MPEG4, -+ .id = AV_CODEC_ID_MPEG4, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -399,7 +399,7 @@ - .compression_id = LQT_COMPRESSION_MPEG4_ASP, - }, - { -- .id = CODEC_ID_MSMPEG4V1, -+ .id = AV_CODEC_ID_MSMPEG4V1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -410,7 +410,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MSMPEG4V2, -+ .id = AV_CODEC_ID_MSMPEG4V2, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -421,7 +421,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MSMPEG4V3, -+ .id = AV_CODEC_ID_MSMPEG4V3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -437,7 +437,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_MSMPEG4V3, -+ .id = AV_CODEC_ID_MSMPEG4V3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -452,7 +452,7 @@ - }, - #if 0 - { -- .id = CODEC_ID_WMV1, -+ .id = AV_CODEC_ID_WMV1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -465,7 +465,7 @@ - }, - #endif - { -- .id = CODEC_ID_H263, -+ .id = AV_CODEC_ID_H263, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -477,7 +477,7 @@ - .compatibility_flags = LQT_FILE_QT_OLD | LQT_FILE_QT | LQT_FILE_MP4 | LQT_FILE_3GP, - }, - { -- .id = CODEC_ID_H263, -+ .id = AV_CODEC_ID_H263, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -492,7 +492,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_H264, -+ .id = AV_CODEC_ID_H264, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -503,7 +503,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_H263P, -+ .id = AV_CODEC_ID_H263P, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -517,7 +517,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_H263I, -+ .id = AV_CODEC_ID_H263I, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -528,7 +528,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_SVQ1, -+ .id = AV_CODEC_ID_SVQ1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -539,7 +539,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_SVQ3, -+ .id = AV_CODEC_ID_SVQ3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -550,7 +550,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MJPEG, -+ .id = AV_CODEC_ID_MJPEG, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -564,7 +564,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_MJPEGB, -+ .id = AV_CODEC_ID_MJPEGB, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -578,7 +578,7 @@ - }, - #if LIBAVCODEC_BUILD >= 3346688 - { -- .id = CODEC_ID_TARGA, -+ .id = AV_CODEC_ID_TARGA, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -590,7 +590,7 @@ - #endif - #if LIBAVCODEC_BUILD >= 3347456 - { -- .id = CODEC_ID_TIFF, -+ .id = AV_CODEC_ID_TIFF, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -601,7 +601,7 @@ - }, - #endif - { -- .id = CODEC_ID_8BPS, -+ .id = AV_CODEC_ID_8BPS, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -611,7 +611,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_INDEO3, -+ .id = AV_CODEC_ID_INDEO3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -622,7 +622,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_RPZA, -+ .id = AV_CODEC_ID_RPZA, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -632,7 +632,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_SMC, -+ .id = AV_CODEC_ID_SMC, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -642,7 +642,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_CINEPAK, -+ .id = AV_CODEC_ID_CINEPAK, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -653,7 +653,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_CYUV, -+ .id = AV_CODEC_ID_CYUV, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -664,7 +664,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_QTRLE, -+ .id = AV_CODEC_ID_QTRLE, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -677,7 +677,7 @@ - .encoding_colormodels = (int[]){ BC_RGB888, BC_RGBA8888, LQT_COLORMODEL_NONE }, - }, - { -- .id = CODEC_ID_MSRLE, -+ .id = AV_CODEC_ID_MSRLE, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -687,7 +687,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -703,7 +703,7 @@ - .image_sizes = image_sizes_dv, - }, - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -719,7 +719,7 @@ - .image_sizes = image_sizes_dv, - }, - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -735,7 +735,7 @@ - }, - /* DVCPRO HD (decoding only for now) */ - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -756,7 +756,7 @@ - // .do_encode = 1 - }, - { -- .id = CODEC_ID_FFVHUFF, -+ .id = AV_CODEC_ID_FFVHUFF, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -769,7 +769,7 @@ - .do_encode = 1 - }, - { -- .id = CODEC_ID_FFV1, -+ .id = AV_CODEC_ID_FFV1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -785,7 +785,7 @@ - }, - #if LIBAVCODEC_BUILD >= 3352576 - { -- .id = CODEC_ID_DNXHD, -+ .id = AV_CODEC_ID_DNXHD, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -801,7 +801,7 @@ - }, - #endif - { -- .id = CODEC_ID_MPEG2VIDEO, -+ .id = AV_CODEC_ID_MPEG2VIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -823,7 +823,7 @@ - struct CODECIDMAP codecidmap_a[] = - { - { -- .id = CODEC_ID_MP3, -+ .id = AV_CODEC_ID_MP3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -835,7 +835,7 @@ - .wav_ids = { 0x50, 0x55, LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MP2, -+ .id = AV_CODEC_ID_MP2, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -850,7 +850,7 @@ - .compression_id = LQT_COMPRESSION_MP2, - }, - { -- .id = CODEC_ID_AC3, -+ .id = AV_CODEC_ID_AC3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -865,7 +865,7 @@ - .compression_id = LQT_COMPRESSION_AC3, - }, - { -- .id = CODEC_ID_QDM2, -+ .id = AV_CODEC_ID_QDM2, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -880,7 +880,7 @@ - #if 1 - /* Doesn't work as long as audio chunks are not split into VBR "Samples" */ - { -- .id = CODEC_ID_ALAC, -+ .id = AV_CODEC_ID_ALAC, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -893,7 +893,7 @@ - #if 1 - /* Sounds ugly */ - { -- .id = CODEC_ID_ADPCM_MS, -+ .id = AV_CODEC_ID_ADPCM_MS, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -906,7 +906,7 @@ - #if 1 - /* Sounds ugly */ - { -- .id = CODEC_ID_ADPCM_IMA_WAV, -+ .id = AV_CODEC_ID_ADPCM_IMA_WAV, - .index = -1, - .encoder = NULL, - .decoder = NULL, ---- libquicktime-1.2.4/plugins/ffmpeg/video.c.orig 2016-02-17 08:14:18.585735622 +0000 -+++ libquicktime-1.2.4/plugins/ffmpeg/video.c 2016-02-17 08:14:35.332331900 +0000 -@@ -400,7 +400,7 @@ - codec->reinterpret_pix_fmt = codec->avctx->pix_fmt; - - /* First we try codec-specific colormodel matching. */ -- if(codec->decoder->id == CODEC_ID_DNXHD) -+ if(codec->decoder->id == AV_CODEC_ID_DNXHD) - { - /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which - we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */ -@@ -438,7 +438,7 @@ - quicktime_ffmpeg_video_codec_t *codec = vtrack->codec->priv; - codec->avctx->pix_fmt = lqt_ffmpeg_get_ffmpeg_colormodel(vtrack->stream_cmodel); - -- if (codec->encoder->id == CODEC_ID_DNXHD) -+ if (codec->encoder->id == AV_CODEC_ID_DNXHD) - { - /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 - and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10 -@@ -728,13 +728,13 @@ - - /* Set extradata: It's done differently for each codec */ - -- if(codec->decoder->id == CODEC_ID_SVQ3) -+ if(codec->decoder->id == AV_CODEC_ID_SVQ3) - { - extradata = trak->mdia.minf.stbl.stsd.table[0].table_raw + 4; - extradata_size = trak->mdia.minf.stbl.stsd.table[0].table_raw_size - 4; - - } -- else if(codec->decoder->id == CODEC_ID_H264) -+ else if(codec->decoder->id == AV_CODEC_ID_H264) - { - user_atom = quicktime_stsd_get_user_atom(trak, "avcC", &user_atom_len); - -@@ -753,7 +753,7 @@ - } - - } -- else if(codec->decoder->id == CODEC_ID_MPEG4) -+ else if(codec->decoder->id == AV_CODEC_ID_MPEG4) - { - if(trak->mdia.minf.stbl.stsd.table[0].has_esds) - { -@@ -947,15 +947,15 @@ - } - #endif - } -- if(codec->decoder->id == CODEC_ID_DVVIDEO) -+ if(codec->decoder->id == AV_CODEC_ID_DVVIDEO) - { - if(vtrack->stream_cmodel == BC_YUV420P) - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; - vtrack->interlace_mode = LQT_INTERLACE_BOTTOM_FIRST; - vtrack->ci.id = LQT_COMPRESSION_DV; - } -- else if((codec->decoder->id == CODEC_ID_MPEG4) || -- (codec->decoder->id == CODEC_ID_H264)) -+ else if((codec->decoder->id == AV_CODEC_ID_MPEG4) || -+ (codec->decoder->id == AV_CODEC_ID_H264)) - { - if(vtrack->stream_cmodel == BC_YUV420P) - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; -@@ -1299,13 +1299,13 @@ - { - if(vtrack->stream_cmodel == BC_YUV420P) - { -- if(codec->encoder->id == CODEC_ID_MPEG4) -+ if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; - /* enable interlaced encoding */ - vtrack->interlace_mode = LQT_INTERLACE_NONE; - } -- else if(codec->encoder->id == CODEC_ID_DVVIDEO) -+ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) - { - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; - } -@@ -1340,7 +1340,7 @@ - codec->avctx->sample_aspect_ratio.num = pixel_width; - codec->avctx->sample_aspect_ratio.den = pixel_height; - /* Use global headers for mp4v */ -- if(codec->encoder->id == CODEC_ID_MPEG4) -+ if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -@@ -1364,12 +1364,12 @@ - } - #endif - } -- else if((codec->encoder->id == CODEC_ID_MSMPEG4V3) && (trak->strl) && -+ else if((codec->encoder->id == AV_CODEC_ID_MSMPEG4V3) && (trak->strl) && - !strncmp(trak->strl->strf.bh.biCompression, "DIV3", 4)) - { - strncpy(trak->strl->strh.fccHandler, "div3", 4); - } -- else if((codec->encoder->id == CODEC_ID_H263) && -+ else if((codec->encoder->id == AV_CODEC_ID_H263) && - (file->file_type & (LQT_FILE_MP4|LQT_FILE_3GP))) - { - uint8_t d263_data[] = -@@ -1383,7 +1383,7 @@ - strncpy(trak->mdia.minf.stbl.stsd.table[0].format, - "s263", 4); - } -- else if(codec->encoder->id == CODEC_ID_FFVHUFF) -+ else if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -@@ -1391,7 +1391,7 @@ - codec->write_global_header = 1; - } - } -- else if(codec->encoder->id == CODEC_ID_QTRLE) -+ else if(codec->encoder->id == AV_CODEC_ID_QTRLE) - { - if(vtrack->stream_cmodel == BC_RGBA8888) - { -@@ -1402,11 +1402,11 @@ - vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; - } - } -- else if(codec->encoder->id == CODEC_ID_DVVIDEO) -+ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) - { - set_dv_fourcc(width, height, vtrack->stream_cmodel, trak); - } -- else if(codec->encoder->id == CODEC_ID_DNXHD) -+ else if(codec->encoder->id == AV_CODEC_ID_DNXHD) - { - if(vtrack->interlace_mode != LQT_INTERLACE_NONE) - { -@@ -1558,12 +1558,12 @@ - - #endif - -- if(!was_initialized && codec->encoder->id == CODEC_ID_DNXHD) -+ if(!was_initialized && codec->encoder->id == AV_CODEC_ID_DNXHD) - setup_avid_atoms(file, vtrack, codec->buffer, bytes_encoded); - - if(bytes_encoded) - { -- if (pts == AV_NOPTS_VALUE || (codec->encoder->id == CODEC_ID_DNXHD && pts == 0)) -+ if (pts == AV_NOPTS_VALUE || (codec->encoder->id == AV_CODEC_ID_DNXHD && pts == 0)) - { - /* Some codecs don't bother generating presentation timestamps. - FFMpeg's DNxHD encoder doesn't even bother to set it to AV_NOPTS_VALUE. */ -@@ -1590,13 +1590,13 @@ - - if(codec->write_global_header && !codec->global_header_written) - { -- if(codec->encoder->id == CODEC_ID_FFVHUFF) -+ if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) - { - quicktime_user_atoms_add_atom(&trak->mdia.minf.stbl.stsd.table[0].user_atoms, - "glbl", - codec->avctx->extradata, codec->avctx->extradata_size ); - } -- else if(codec->encoder->id == CODEC_ID_MPEG4) -+ else if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - int advanced = 0; - if(codec->avctx->max_b_frames || -@@ -1903,18 +1903,18 @@ - codec_base->encode_video = lqt_ffmpeg_encode_video; - codec_base->set_pass = set_pass_ffmpeg; - -- if(encoder->id == CODEC_ID_MPEG4) -+ if(encoder->id == AV_CODEC_ID_MPEG4) - { - codec_base->writes_compressed = writes_compressed_mpeg4; - codec_base->init_compressed = init_compressed_mpeg4; - codec_base->write_packet = write_packet_mpeg4; - } -- else if(encoder->id == CODEC_ID_MPEG2VIDEO) -+ else if(encoder->id == AV_CODEC_ID_MPEG2VIDEO) - { - codec_base->writes_compressed = writes_compressed_imx; - codec_base->init_compressed = init_compressed_imx; - } -- else if(encoder->id == CODEC_ID_DVVIDEO) -+ else if(encoder->id == AV_CODEC_ID_DVVIDEO) - { - codec_base->init_compressed = init_compressed_dv; - } -@@ -1922,7 +1922,7 @@ - } - if(decoder) - { -- if(decoder->id == CODEC_ID_H264) -+ if(decoder->id == AV_CODEC_ID_H264) - codec_base->read_packet = read_packet_h264; - codec_base->decode_video = lqt_ffmpeg_decode_video; - } ---- libquicktime-1.2.4/plugins/ffmpeg/audio.c.orig 2016-02-17 08:17:57.421481934 +0000 -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c 2016-02-17 08:18:05.254782305 +0000 -@@ -626,7 +626,7 @@ - { - /* If the codec is mp3, make sure to decode the very last frame */ - -- if((codec->avctx->codec_id == CODEC_ID_MP3) && -+ if((codec->avctx->codec_id == AV_CODEC_ID_MP3) && - (codec->bytes_in_chunk_buffer >= 4)) - { - if(!mpa_decode_header(&mph, codec->chunk_buffer, (const mpa_header*)0)) -@@ -695,7 +695,7 @@ - - /* Some really broken mp3 files have the header bytes split across 2 chunks */ - -- if(codec->avctx->codec_id == CODEC_ID_MP3) -+ if(codec->avctx->codec_id == AV_CODEC_ID_MP3) - { - if(codec->bytes_in_chunk_buffer < 4) - { -@@ -806,7 +806,7 @@ - - if(bytes_decoded < 0) - { -- if(codec->avctx->codec_id == CODEC_ID_MP3) -+ if(codec->avctx->codec_id == AV_CODEC_ID_MP3) - { - /* For mp3, bytes_decoded < 0 means, that the frame should be muted */ - memset(&codec->sample_buffer[track_map->channels * (codec->sample_buffer_end - -@@ -866,8 +866,8 @@ - quicktime_audio_map_t *track_map = &file->atracks[track]; - quicktime_ffmpeg_audio_codec_t *codec = track_map->codec->priv; - -- if((codec->decoder->id == CODEC_ID_MP2) || -- (codec->decoder->id == CODEC_ID_MP3)) -+ if((codec->decoder->id == AV_CODEC_ID_MP2) || -+ (codec->decoder->id == AV_CODEC_ID_MP3)) - { - mpa_header h; - uint32_t header; -@@ -909,7 +909,7 @@ - else - track_map->ci.bitrate = h.bitrate; - } -- else if(codec->decoder->id == CODEC_ID_AC3) -+ else if(codec->decoder->id == AV_CODEC_ID_AC3) - { - a52_header h; - uint8_t * ptr; -@@ -986,7 +986,7 @@ - #endif - /* Some codecs need extra stuff */ - -- if(codec->decoder->id == CODEC_ID_ALAC) -+ if(codec->decoder->id == AV_CODEC_ID_ALAC) - { - header = quicktime_wave_get_user_atom(track_map->track, "alac", &header_len); - if(header) -@@ -995,7 +995,7 @@ - codec->avctx->extradata_size = header_len; - } - } -- if(codec->decoder->id == CODEC_ID_QDM2) -+ if(codec->decoder->id == AV_CODEC_ID_QDM2) - { - header = quicktime_wave_get_user_atom(track_map->track, "QDCA", &header_len); - if(header) -@@ -1495,9 +1495,9 @@ - codec_base->decode_audio = lqt_ffmpeg_decode_audio; - codec_base->set_parameter = set_parameter; - -- if((decoder->id == CODEC_ID_MP3) || (decoder->id == CODEC_ID_MP2)) -+ if((decoder->id == AV_CODEC_ID_MP3) || (decoder->id == AV_CODEC_ID_MP2)) - codec_base->read_packet = read_packet_mpa; -- else if(decoder->id == CODEC_ID_AC3) -+ else if(decoder->id == AV_CODEC_ID_AC3) - { - codec_base->write_packet = write_packet_ac3; - codec_base->read_packet = read_packet_ac3; diff --git a/libraries/libquicktime/libquicktime.SlackBuild b/libraries/libquicktime/libquicktime.SlackBuild index 522d29632bc..c4924d7f0a2 100644 --- a/libraries/libquicktime/libquicktime.SlackBuild +++ b/libraries/libquicktime/libquicktime.SlackBuild @@ -80,17 +80,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 {} \+ -# Fix compatibility with ffmpeg 4.x -patch -p1 -i $CWD/libquicktime-1.2.4-ffmpeg2.patch -patch -p1 -i $CWD/libquicktime-ffmpeg3.patch -patch -p1 -i $CWD/libquicktime-1.2.4-ffmpeg4.patch +# Upstream seems to have dropped ffmpeg support # Fix compiling against newer faad2 patch -p1 -i $CWD/libquicktime-1.2.4-faad2.patch autoreconf -vif -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -101,6 +98,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-gpl \ --with-libdv \ + --without-ffmpeg \ --build=$ARCH-slackware-linux make diff --git a/libraries/libsoup3/README b/libraries/libsoup3/README deleted file mode 100644 index dbdd7128d31..00000000000 --- a/libraries/libsoup3/README +++ /dev/null @@ -1,6 +0,0 @@ -Soup is an HTTP client/server library implementation in C. It uses -GObjects and the glib main loop to integrate well with GTK+ -applications, and has a synchronous API suitable for use in threaded -applications. - -NOTE: This package can co-exist with libsoup package in Slackware. diff --git a/libraries/libsoup3/libsoup3.SlackBuild b/libraries/libsoup3/libsoup3.SlackBuild deleted file mode 100644 index 8f8d823ff56..00000000000 --- a/libraries/libsoup3/libsoup3.SlackBuild +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/bash - -# Slackware build script for libsoup3 - -# Copyright 2022-2024 Willy Sudiarto Raharjo -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libsoup3 -SRCNAM=libsoup -VERSION=${VERSION:-3.6.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2 -cd $SRCNAM-$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 build -cd build - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - meson .. \ - --buildtype=release \ - --infodir=/usr/info \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --mandir=/usr/man \ - --prefix=/usr \ - -Dtests=FALSE \ - -Dsysprof="disabled" \ - -Dstrip=true \ - -Ddocs="disabled" \ - --sysconfdir=/etc - ninja - DESTDIR=$PKG ninja install -cd .. - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING NEWS README docs examples $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 diff --git a/libraries/libsoup3/libsoup3.info b/libraries/libsoup3/libsoup3.info deleted file mode 100644 index 3dad3dc8cb0..00000000000 --- a/libraries/libsoup3/libsoup3.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libsoup3" -VERSION="3.6.0" -HOMEPAGE="https://gitlab.gnome.org/GNOME/libsoup" -DOWNLOAD="https://gitlab.gnome.org/GNOME/libsoup/-/archive/3.6.0/libsoup-3.6.0.tar.bz2" -MD5SUM="7e9e86dfed0d8f270df3aa6e03bcb196" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/libraries/libsoup3/slack-desc b/libraries/libsoup3/slack-desc deleted file mode 100644 index 2567a528e2c..00000000000 --- a/libraries/libsoup3/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 ':'. - - |-----handy-ruler------------------------------------------------------| -libsoup3: libsoup3 (an HTTP client/server library) -libsoup3: -libsoup3: Soup is an HTTP client/server library implementation in C. It uses -libsoup3: GObjects and the glib main loop to integrate well with GTK+ -libsoup3: applications, and has a synchronous API suitable for use in threaded -libsoup3: applications. -libsoup3: -libsoup3: -libsoup3: -libsoup3: -libsoup3: diff --git a/libraries/libunibreak/README b/libraries/libunibreak/README deleted file mode 100644 index 597ba98bcb0..00000000000 --- a/libraries/libunibreak/README +++ /dev/null @@ -1,9 +0,0 @@ -libunibreak (a line breaking library) - -Libunibreak is an implementation of the line breaking and word -breaking algorithms as described in Unicode Standard Annex 14 and -Unicode Standard Annex 29. - -It is designed to be used in a generic text renderer. FBReader is one -real-world example, and the Enlightenment Foundation Libraries are -another. diff --git a/libraries/libunibreak/libunibreak.SlackBuild b/libraries/libunibreak/libunibreak.SlackBuild deleted file mode 100644 index 9251cefd1ee..00000000000 --- a/libraries/libunibreak/libunibreak.SlackBuild +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash - -# Slackware build script for libunibreak -# Maintained as of version 3.0 by slackmart -# Now maintained by B. Watson -# Original version had no license; now licensed under the WTFPL. See -# http://www.wtfpl.net/txt/copying/ for details. - -# 20240315 bkw: update for v6.1 -# 20230111 bkw: update for v5.1 -# 20211003 bkw: -# - take over maintenance -# - update for v4.3 -# - add HTML docs to package - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=libunibreak -VERSION=${VERSION:-6.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -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 /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ ---prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-static=no \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG -rm -f $PKG/usr/lib*/*.la - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS* LICEN* NEWS README* doc/html $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 diff --git a/libraries/libunibreak/libunibreak.info b/libraries/libunibreak/libunibreak.info deleted file mode 100644 index cfdbef9981a..00000000000 --- a/libraries/libunibreak/libunibreak.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libunibreak" -VERSION="6.1" -HOMEPAGE="https://github.com/adah1972/libunibreak/" -DOWNLOAD="https://github.com/adah1972/libunibreak/releases/download/libunibreak_6_1/libunibreak-6.1.tar.gz" -MD5SUM="8df410d010e03de1a339a400a920335e" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="B. Watson" -EMAIL="urchlay@slackware.uk" diff --git a/libraries/libunibreak/slack-desc b/libraries/libunibreak/slack-desc deleted file mode 100644 index dfb36c5f36b..00000000000 --- a/libraries/libunibreak/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------------------------------------------------------| -libunibreak: libunibreak (a line breaking library) -libunibreak: -libunibreak: Libunibreak is an implementation of the line breaking and word -libunibreak: breaking algorithms as described in Unicode Standard Annex 14 and -libunibreak: Unicode Standard Annex 29. -libunibreak: -libunibreak: It is designed to be used in a generic text renderer. FBReader is -libunibreak: one real-world example, and the Enlightenment Foundation Libraries -libunibreak: are another. -libunibreak: -libunibreak: diff --git a/libraries/libunicap/libunicap.SlackBuild b/libraries/libunicap/libunicap.SlackBuild index cd365f1adf2..d9b730847ad 100644 --- a/libraries/libunicap/libunicap.SlackBuild +++ b/libraries/libunicap/libunicap.SlackBuild @@ -68,6 +68,8 @@ patch -p1 < $CWD/gcc10.patch sed -i "s|linux\/videodev\.|libv4l1-videodev.|" \ cpi/v4l/v4l.c cpi/v4l2cpi/uvcvideo.h +sed -i "s|charset=|charset=UTF-8|" po/de.po + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/libvirt-glib/libvirt-glib-4.0.0-cast-align.patch b/libraries/libvirt-glib/libvirt-glib-4.0.0-cast-align.patch deleted file mode 100644 index 666babaca63..00000000000 --- a/libraries/libvirt-glib/libvirt-glib-4.0.0-cast-align.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup libvirt-glib-4.0.0.orig/meson.build libvirt-glib-4.0.0.new/meson.build ---- libvirt-glib-4.0.0.orig/meson.build 2021-02-15 12:23:04.609036200 +0000 -+++ libvirt-glib-4.0.0.new/meson.build 2021-02-15 14:50:24.838971022 +0000 -@@ -175,8 +175,6 @@ cc_flags += [ - '-Wbuiltin-declaration-mismatch', - '-Wbuiltin-macro-redefined', - '-Wcannot-profile', -- '-Wcast-align', -- '-Wcast-align=strict', - '-Wcast-function-type', - '-Wchar-subscripts', - '-Wclobbered', diff --git a/libraries/libvirt-glib/libvirt-glib.SlackBuild b/libraries/libvirt-glib/libvirt-glib.SlackBuild index 96ebde059dd..0c46671882c 100644 --- a/libraries/libvirt-glib/libvirt-glib.SlackBuild +++ b/libraries/libvirt-glib/libvirt-glib.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libvirt-glib -# Copyright 2012-2021 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2012-2024 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libvirt-glib -VERSION=${VERSION:-4.0.0} +VERSION=${VERSION:-5.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,8 +76,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch -p1 < $CWD/libvirt-glib-4.0.0-cast-align.patch - mkdir build cd build CFLAGS="$SLKCFLAGS" \ diff --git a/libraries/libvirt-glib/libvirt-glib.info b/libraries/libvirt-glib/libvirt-glib.info index 560c9a11d01..5528f83e511 100644 --- a/libraries/libvirt-glib/libvirt-glib.info +++ b/libraries/libvirt-glib/libvirt-glib.info @@ -1,8 +1,8 @@ PRGNAM="libvirt-glib" -VERSION="4.0.0" +VERSION="5.0.0" HOMEPAGE="http://libvirt.org/" -DOWNLOAD="https://libvirt.org/sources/glib/libvirt-glib-4.0.0.tar.xz" -MD5SUM="0d0932949cde8a8933f6fb6aaf66dfe0" +DOWNLOAD="https://download.libvirt.org/glib/libvirt-glib-5.0.0.tar.xz" +MD5SUM="2e36b42b91bb98fac22321b5afc5a835" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libvirt" diff --git a/libraries/libvirt-python/libvirt-python.SlackBuild b/libraries/libvirt-python/libvirt-python.SlackBuild index 047fa9cfc21..91680259e34 100644 --- a/libraries/libvirt-python/libvirt-python.SlackBuild +++ b/libraries/libvirt-python/libvirt-python.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libvirt-python -# Copyright 2013-2023 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2013-2024 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libvirt-python -VERSION=${VERSION:-9.1.0} +VERSION=${VERSION:-10.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/libraries/libvirt-python/libvirt-python.info b/libraries/libvirt-python/libvirt-python.info index 9904928d471..f8e40809a8a 100644 --- a/libraries/libvirt-python/libvirt-python.info +++ b/libraries/libvirt-python/libvirt-python.info @@ -1,8 +1,8 @@ PRGNAM="libvirt-python" -VERSION="9.1.0" +VERSION="10.8.0" HOMEPAGE="https://libvirt.org" -DOWNLOAD="https://libvirt.org/sources/python/libvirt-python-9.1.0.tar.gz" -MD5SUM="24a0043ff93979fa2b9ca8925893a6e4" +DOWNLOAD="https://download.libvirt.org/python/libvirt-python-10.8.0.tar.gz" +MD5SUM="cb4550f308efca2795911e0d245403bf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libvirt" diff --git a/libraries/libvirt/README b/libraries/libvirt/README index dcf8472fc23..adddc0abc14 100644 --- a/libraries/libvirt/README +++ b/libraries/libvirt/README @@ -46,13 +46,11 @@ There is also a 'guests_reboot' for rebooting all running guests. Have a look at the commented part of rc.libvirt for some gotchas. -netcat-openbsd is an optional dependency (needed if you -want to connect from a remote host using virt-manager). -Other optional dependencies include avahi, xen, audit, glusterfs, -numactl, open-iscsi and libiscsi. +Optional dependencies include avahi, xen, audit, glusterfs, numactl, +open-iscsi and libiscsi. As of the 4.5.0 version, you may have to remove any previously -installed versions of libvirt before this will build. +installed version of libvirt before this will build. Note also that sometimes, in consequence of a major-version upgrade, you might discover that the libvirt configuration is in an inconsistent diff --git a/libraries/libvirt/libvirt.SlackBuild b/libraries/libvirt/libvirt.SlackBuild index 1da38ef8316..35f9009d7fc 100644 --- a/libraries/libvirt/libvirt.SlackBuild +++ b/libraries/libvirt/libvirt.SlackBuild @@ -10,7 +10,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libvirt -VERSION=${VERSION:-9.1.0} +VERSION=${VERSION:-10.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -61,6 +61,7 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION +rm -fR tests/vircaps2xmldata # either this or find outputs "filesystem loop detected" chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/libraries/libvirt/libvirt.info b/libraries/libvirt/libvirt.info index 8a7276895c9..281167d4e37 100644 --- a/libraries/libvirt/libvirt.info +++ b/libraries/libvirt/libvirt.info @@ -1,8 +1,8 @@ PRGNAM="libvirt" -VERSION="9.1.0" +VERSION="10.8.0" HOMEPAGE="http://libvirt.org" -DOWNLOAD="https://libvirt.org/sources/libvirt-9.1.0.tar.xz" -MD5SUM="fbfab9819030ec363f0b1e88ca5b83de" +DOWNLOAD="https://download.libvirt.org/libvirt-10.8.0.tar.xz" +MD5SUM="8323e708c3d8c2532420d215ac7e9aa8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="yajl" diff --git a/libraries/mujs/README b/libraries/mujs/README deleted file mode 100644 index fa4de238867..00000000000 --- a/libraries/mujs/README +++ /dev/null @@ -1,13 +0,0 @@ -MuJS is a lightweight Javascript interpreter designed for embedding -in other software to extend them with scripting capabilities. It -is written in portable C and implements ECMAScript as specified by -ECMA-262. - -Why? Because V8, SpiderMonkey and JavaScriptCore are all too big and -complex. MuJS's focus is on small size, correctness and simplicity. - -The interface for binding with native code is designed to be as -simple as possible to use, and is similar to Lua. There is no need -for interacting with byzantine C++ template mechanisms, or worry -about marking and unmarking garbage collection roots, or wrestle with -obscure build systems. diff --git a/libraries/mujs/mujs.SlackBuild b/libraries/mujs/mujs.SlackBuild deleted file mode 100644 index 82d8efc55c6..00000000000 --- a/libraries/mujs/mujs.SlackBuild +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/bash - -# Slackware build script for mujs - -# Written by Valerio Talora -# Copyright (c) 2018 (versions 1.0.3-1.0.5) Andreas Guldstrand -# Copyright (c) 2020-2023 Christoph Willing, Brisbane, Australia -# 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. - -# 20220419 bkw: Modified by SlackBuilds.org, BUILD=2: -# - fix permission on png file in doc dir. -# - i486 => i586. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=mujs -VERSION=${VERSION:-1.3.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" - SLKLDFLAGS="-L/usr/X11R6/lib64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -sed -i -e '/LIBREADLINE +=/ s/$/ -ltermcap/' Makefile - -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 {} \+ -chmod 644 docs/*.png - -make shared && make install-shared \ - prefix=/usr \ - libdir=/usr/lib${LIBDIRSUFFIX} \ - DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING README docs $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 diff --git a/libraries/mujs/mujs.info b/libraries/mujs/mujs.info deleted file mode 100644 index 8d50d5ec6f7..00000000000 --- a/libraries/mujs/mujs.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="mujs" -VERSION="1.3.2" -HOMEPAGE="https://mujs.com/" -DOWNLOAD="https://mujs.com/downloads/mujs-1.3.2.tar.xz" -MD5SUM="c2221592e7033fd32cc399e24ca44f18" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Christoph Willing" -EMAIL="chris.willing@linux.com" diff --git a/libraries/mujs/slack-desc b/libraries/mujs/slack-desc deleted file mode 100644 index 779d124fb2d..00000000000 --- a/libraries/mujs/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------------------------------------------------------| -mujs: mujs (javascript interpreter) -mujs: -mujs: MuJS is a lightweight Javascript interpreter designed for embedding -mujs: in other software to extend them with scripting capabilities. It is -mujs: written in portable C and implements ECMAScript as specified by -mujs: ECMA-262. -mujs: -mujs: Why? Because V8, SpiderMonkey and JavaScriptCore are all too big -mujs: and complex. -mujs: MuJS's focus is on small size, correctness and simplicity. -mujs: diff --git a/libraries/nghttp3/README b/libraries/nghttp3/README deleted file mode 100644 index 7170da6f09b..00000000000 --- a/libraries/nghttp3/README +++ /dev/null @@ -1,42 +0,0 @@ -nghttp3 -======= - -nghttp3 is an implementation of `RFC 9114 -`_ HTTP/3 mapping over -QUIC and `RFC 9204 `_ -QPACK in C. - -It does not depend on any particular QUIC transport implementation. - -Documentation -------------- - -`Online documentation `_ is available. - -HTTP/3 ------- - -This library implements `RFC 9114 -`_ HTTP/3. It does not -support server push. - -The following extensions have been implemented: - -- `Extensible Prioritization Scheme for HTTP - `_ -- `Bootstrapping WebSockets with HTTP/3 - `_ - -QPACK ------ - -This library implements `RFC 9204 -`_ QPACK. It supports -dynamic table. - -License -------- - -The MIT License - -Copyright (c) 2019 nghttp3 contributors diff --git a/libraries/nghttp3/nghttp3.SlackBuild b/libraries/nghttp3/nghttp3.SlackBuild deleted file mode 100644 index 4b3eca010bd..00000000000 --- a/libraries/nghttp3/nghttp3.SlackBuild +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -# Slackware build script for nghttp3 -# Copyright 2023 Lockywolf - -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=nghttp3 -VERSION=${VERSION:-1.1.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi -set -e -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -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 {} \; - -sed -i '/find_package(CUnit 2.1)/d' CMakeLists.txt - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DMAN_INSTALL_DIR=/usr/man \ - -DENABLE_STATIC_LIB=OFF \ - -DENABLE_LIB_ONLY=ON \ - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DCMAKE_C_COMPILER_LAUNCHER=ccache \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install/strip DESTDIR=$PKG -cd .. - -mkdir -p $PKG/usr/doc -mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION -rm -rf $PKG/usr/share/doc - -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 -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 diff --git a/libraries/nghttp3/nghttp3.info b/libraries/nghttp3/nghttp3.info deleted file mode 100644 index 0f81d7f84c0..00000000000 --- a/libraries/nghttp3/nghttp3.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="nghttp3" -VERSION="1.1.0" -HOMEPAGE="https://github.com/ngtcp2/nghttp3" -DOWNLOAD="https://github.com/ngtcp2/nghttp3/releases/download/v1.1.0/nghttp3-1.1.0.tar.gz" -MD5SUM="ea019228256d4f883cc6f4ca634b8bd0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Lockywolf" -EMAIL="for_sbo.nghttp3_2023-05-17@lockywolf.net" diff --git a/libraries/nghttp3/slack-desc b/libraries/nghttp3/slack-desc deleted file mode 100644 index efc49a5abbc..00000000000 --- a/libraries/nghttp3/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------------------------------------------------------| -nghttp3: nghttp3 (an implementation of RFC 9114 HTTP/3 over QUIC) -nghttp3: -nghttp3: nghttp3 is an implementation of RFC 9114 HTTP/3 mapping over QUIC -nghttp3: and RFC 9204 QPACK in C. -nghttp3: It does not depend on any particular QUIC transport implementation. -nghttp3: -nghttp3: -nghttp3: -nghttp3: -nghttp3: -nghttp3: diff --git a/libraries/ngtcp2/ngtcp2.SlackBuild b/libraries/ngtcp2/ngtcp2.SlackBuild index 5285df76e31..d16b4b657fc 100644 --- a/libraries/ngtcp2/ngtcp2.SlackBuild +++ b/libraries/ngtcp2/ngtcp2.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ngtcp2 -VERSION=${VERSION:-1.2.0} +VERSION=${VERSION:-1.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -116,4 +116,4 @@ cp -a \ 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 +/sbin/makepkg --remove-rpaths -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/ngtcp2/ngtcp2.info b/libraries/ngtcp2/ngtcp2.info index cd3cb8745f1..5b9b3a32238 100644 --- a/libraries/ngtcp2/ngtcp2.info +++ b/libraries/ngtcp2/ngtcp2.info @@ -1,8 +1,8 @@ PRGNAM="ngtcp2" -VERSION="1.2.0" +VERSION="1.8.0" HOMEPAGE="https://github.com/ngtcp2/ngtcp2/" -DOWNLOAD="https://github.com/ngtcp2/ngtcp2/releases/download/v1.2.0/ngtcp2-1.2.0.tar.gz" -MD5SUM="d19df333cb0b0bc95046dfd30f5b7348" +DOWNLOAD="https://github.com/ngtcp2/ngtcp2/releases/download/v1.8.0/ngtcp2-1.8.0.tar.gz" +MD5SUM="73e7dca33392a90f29f6bf0aaf3f26f1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libev nghttp3" diff --git a/libraries/nlohmann_json/nlohmann_json.SlackBuild b/libraries/nlohmann_json/nlohmann_json.SlackBuild index dfcb6419d65..69eb38c5ed3 100644 --- a/libraries/nlohmann_json/nlohmann_json.SlackBuild +++ b/libraries/nlohmann_json/nlohmann_json.SlackBuild @@ -76,6 +76,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 {} \; +for i in $CWD/patches/* ; do patch -p1 < $i ; done + mkdir -p build cd build cmake \ diff --git a/libraries/nlohmann_json/patches/1_6cec5aefc97ad219b6fd5a4132f88f7c8f6800ee.patch b/libraries/nlohmann_json/patches/1_6cec5aefc97ad219b6fd5a4132f88f7c8f6800ee.patch new file mode 100644 index 00000000000..6f133312ee7 --- /dev/null +++ b/libraries/nlohmann_json/patches/1_6cec5aefc97ad219b6fd5a4132f88f7c8f6800ee.patch @@ -0,0 +1,55 @@ +From 6cec5aefc97ad219b6fd5a4132f88f7c8f6800ee Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Wed, 8 Mar 2023 11:31:56 +0000 +Subject: [PATCH] custom allocators: define missing 'rebind' type (#3895) + +--- + tests/src/unit-allocator.cpp | 9 +++++++++ + tests/src/unit-regression2.cpp | 9 +++++++++ + 2 files changed, 18 insertions(+) + +diff --git a/tests/src/unit-allocator.cpp b/tests/src/unit-allocator.cpp +index 76e3b03f10..f2e63552a4 100644 +--- a/tests/src/unit-allocator.cpp ++++ b/tests/src/unit-allocator.cpp +@@ -20,11 +20,20 @@ struct bad_allocator : std::allocator + { + using std::allocator::allocator; + ++ bad_allocator() = default; ++ template bad_allocator(const bad_allocator& /*unused*/) { } ++ + template + void construct(T* /*unused*/, Args&& ... /*unused*/) + { + throw std::bad_alloc(); + } ++ ++ template ++ struct rebind ++ { ++ using other = bad_allocator; ++ }; + }; + } // namespace + +diff --git a/tests/src/unit-regression2.cpp b/tests/src/unit-regression2.cpp +index 2bb9b32e51..dbafb436ba 100644 +--- a/tests/src/unit-regression2.cpp ++++ b/tests/src/unit-regression2.cpp +@@ -189,6 +189,15 @@ class my_allocator : public std::allocator + { + public: + using std::allocator::allocator; ++ ++ my_allocator() = default; ++ template my_allocator(const my_allocator& /*unused*/) { } ++ ++ template ++ struct rebind ++ { ++ using other = my_allocator; ++ }; + }; + + ///////////////////////////////////////////////////////////////////// diff --git a/libraries/nlohmann_json/patches/2_660d0b58565073975d6f5d94365d6cbf150a4cf8.patch b/libraries/nlohmann_json/patches/2_660d0b58565073975d6f5d94365d6cbf150a4cf8.patch new file mode 100644 index 00000000000..d14345f40e9 --- /dev/null +++ b/libraries/nlohmann_json/patches/2_660d0b58565073975d6f5d94365d6cbf150a4cf8.patch @@ -0,0 +1,24 @@ +From 660d0b58565073975d6f5d94365d6cbf150a4cf8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= +Date: Sun, 5 Mar 2023 14:11:22 +0100 +Subject: [PATCH] tests/unit-iterators2: use std::ranges::equals for range + comparisons (#3950) + +Closes https://github.com/nlohmann/json/issues/3927 +--- + tests/src/unit-iterators2.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/src/unit-iterators2.cpp b/tests/src/unit-iterators2.cpp +index 27926084c7..72a5d9dc5c 100644 +--- a/tests/src/unit-iterators2.cpp ++++ b/tests/src/unit-iterators2.cpp +@@ -943,7 +943,7 @@ TEST_CASE("iterators 2") + json j_expected{5, 4, 3, 2, 1}; + + auto reversed = j | std::views::reverse; +- CHECK(reversed == j_expected); ++ CHECK(std::ranges::equal(reversed, j_expected)); + } + + SECTION("transform") diff --git a/libraries/nv-codec-headers/README b/libraries/nv-codec-headers/README deleted file mode 100644 index 35098671320..00000000000 --- a/libraries/nv-codec-headers/README +++ /dev/null @@ -1,18 +0,0 @@ -The FFmpeg version of Nvidia Codec SDK headers which are required -to interface with Nvidia's codec APIs. The purpose of these -headers is to allow hardware (GPU) encoding with suitable NVidia -cards. This version corresponds to Video Codec SDK version 11.1.5 -and requires NVidia drivers version 470.57.02 or newer. - -There are 3 stages in the history of NVidia GPU encoding with FFmpeg: - - 1. Pre August 27th 2016 it was necessary to track down your own - headers to build nvenc. - 2. Post August 27th 2016 the required headers were incorporated - as part of the FFmpeg source. - 3. Post February 26th 2018 the NVidia headers were removed from - the FFmpeg source and a separate git repository was created - to hold continuing work with these headers. - -This nv-codec-headers script is for point 3 where the headers will -need to be installed before compiling a recent FFmpeg. diff --git a/libraries/nv-codec-headers/nv-codec-headers.SlackBuild b/libraries/nv-codec-headers/nv-codec-headers.SlackBuild deleted file mode 100644 index 1faff221c03..00000000000 --- a/libraries/nv-codec-headers/nv-codec-headers.SlackBuild +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -# Slackware build script for nv-codec-headers - -# Copyright 2018-2023, Andrew Strong, Blue Mountains, Australia. -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=nv-codec-headers -# Note that the version number is contained -# within the file ffnvcodec.pc.in: -VERSION=${VERSION:-11.1.5.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" -else - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $PKG -cd $TMP -rm -rf $PRGNAM - -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 . - -make PREFIX=/usr LIBDIR=lib${LIBDIRSUFFIX} install DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README $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 diff --git a/libraries/nv-codec-headers/nv-codec-headers.info b/libraries/nv-codec-headers/nv-codec-headers.info deleted file mode 100644 index 47f4502ae11..00000000000 --- a/libraries/nv-codec-headers/nv-codec-headers.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="nv-codec-headers" -VERSION="11.1.5.2" -HOMEPAGE="https://github.com/FFmpeg/nv-codec-headers" -DOWNLOAD="https://github.com/FFmpeg/nv-codec-headers/releases/download/n11.1.5.2/nv-codec-headers-11.1.5.2.tar.gz" -MD5SUM="94fd5479bf934595530d9bfae93c1c55" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Andrew Strong" -EMAIL="andrew.david.strong@gmail.com" diff --git a/libraries/nv-codec-headers/slack-desc b/libraries/nv-codec-headers/slack-desc deleted file mode 100644 index 8187a52c58b..00000000000 --- a/libraries/nv-codec-headers/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------------------------------------------------------| -nv-codec-headers: nv-codec-headers (FFmpeg version of Nvidia Codec SDK headers) -nv-codec-headers: -nv-codec-headers: FFmpeg version of headers required to interface with Nvidia's -nv-codec-headers: codec APIs. Corresponds to Video Codec SDK version 11.1.5. -nv-codec-headers: -nv-codec-headers: -nv-codec-headers: -nv-codec-headers: https://github.com/FFmpeg/nv-codec-headers -nv-codec-headers: -nv-codec-headers: -nv-codec-headers: diff --git a/libraries/nx-libs/nx-libs.SlackBuild b/libraries/nx-libs/nx-libs.SlackBuild index fbc40c8eb67..3bfbde87c1d 100644 --- a/libraries/nx-libs/nx-libs.SlackBuild +++ b/libraries/nx-libs/nx-libs.SlackBuild @@ -34,12 +34,12 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nx-libs -VERSION=${VERSION:-3.5.99.26} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.5.99.27} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -SRCVERSION=$(echo $VERSION | tr _ - ) +SRCVERSION=$(echo $VERSION | tr - _ ) if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -81,7 +81,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$SRCVERSION -tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz +tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.?z cd $PRGNAM-$SRCVERSION chown -R root:root . find -L . \ @@ -90,14 +90,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix for the newer binutils (no more l flag for ar) -sed -i -e "s|ArCmdBase\ clq|ArCmdBase cq|" \ - -e "s|ArCmdBase\ rul|ArCmdBase ru|" \ - -e "s|ArCmdBase\ xl|ArCmdBase x|" \ - nx-X11/config/cf/Imake.tmpl +echo "#define OptimizedCDebugFlags $SLKCFLAGS -fpermissive GccAliasingArgs" >> nx-X11/config/cf/host.def +echo "#define OptimizedCplusplusDebugFlags $SLKCFLAGS GccAliasingArgs" >> nx-X11/config/cf/host.def # Fix man install dir -sed -i "s|share/man|man|g" Makefile +sed -i "s|share/man|man|g" Makefile || exit 1 make -j1 CONFIGURE="./configure --libdir=/usr/lib${LIBDIRSUFFIX} --prefix=/usr --mandir=/usr/man" PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} IMAKE_DEFINES="-DUseTIRPC=YES" diff --git a/libraries/nx-libs/nx-libs.info b/libraries/nx-libs/nx-libs.info index 61974a26a58..71d383bb483 100644 --- a/libraries/nx-libs/nx-libs.info +++ b/libraries/nx-libs/nx-libs.info @@ -1,8 +1,8 @@ PRGNAM="nx-libs" -VERSION="3.5.99.26" +VERSION="3.5.99.27" HOMEPAGE="http://www.x2go.org" -DOWNLOAD="https://github.com/ArcticaProject/nx-libs/archive/3.5.99.26/nx-libs-3.5.99.26.tar.gz" -MD5SUM="ce874313e69f1a0f8c09c7363b006f66" +DOWNLOAD="https://github.com/ArcticaProject/nx-libs/archive/3.5.99.27/nx-libs-3.5.99.27.tar.gz" +MD5SUM="f4b73c5e904a14388916d153effb6f69" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/ogre/ogre.SlackBuild b/libraries/ogre/ogre.SlackBuild index d5311de09e8..6ac80fcade8 100644 --- a/libraries/ogre/ogre.SlackBuild +++ b/libraries/ogre/ogre.SlackBuild @@ -40,8 +40,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ogre -VERSION=${VERSION:-13.2.4} -IMGUIVER=${IMGUIVER:-1.85} +VERSION=${VERSION:-14.2.0} +IMGUIVER=${IMGUIVER:-1.91.0} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/ogre/ogre.info b/libraries/ogre/ogre.info index d24d94a1015..a42e001e784 100644 --- a/libraries/ogre/ogre.info +++ b/libraries/ogre/ogre.info @@ -1,10 +1,10 @@ PRGNAM="ogre" -VERSION="13.2.4" +VERSION="14.2.0" HOMEPAGE="https://www.ogre3d.org/" -DOWNLOAD="https://github.com/OGRECave/ogre/archive/v13.2.4/ogre-13.2.4.zip \ - https://github.com/ocornut/imgui/archive/v1.85/imgui-1.85.tar.gz" -MD5SUM="b540b3feaebe530370c659013c144d23 \ - bb710a24164a8dd54369bc4282d9d3b9" +DOWNLOAD="https://github.com/OGRECave/ogre/archive/v14.2.0/ogre-14.2.0.zip \ + https://github.com/ocornut/imgui/archive/v1.91.0/imgui-1.91.0.tar.gz" +MD5SUM="05d309ee6c7638bb49e58eac013f3060 \ + f10bdc3cbe86df2af9a0b8a30af93c37" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pugixml" diff --git a/libraries/openvino/010-openvino-disable-werror.patch b/libraries/openvino/010-openvino-disable-werror.patch new file mode 100644 index 00000000000..2a168ec344d --- /dev/null +++ b/libraries/openvino/010-openvino-disable-werror.patch @@ -0,0 +1,13 @@ +--- a/src/plugins/intel_gpu/CMakeLists.txt ++++ b/src/plugins/intel_gpu/CMakeLists.txt +@@ -46,10 +46,6 @@ set(INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include") + add_subdirectory(thirdparty) + include(thirdparty/cmake/rapidjson.cmake) + +-if(CMAKE_COMPILER_IS_GNUCXX) +- ov_add_compiler_flags(-Werror) +-endif() +- + add_subdirectory(src/runtime) + add_subdirectory(src/kernel_selector) + add_subdirectory(src/graph) diff --git a/libraries/openvino/020-openvino-use-protobuf-shared-libs.patch b/libraries/openvino/020-openvino-use-protobuf-shared-libs.patch new file mode 100644 index 00000000000..b72bd88db4f --- /dev/null +++ b/libraries/openvino/020-openvino-use-protobuf-shared-libs.patch @@ -0,0 +1,11 @@ +--- a/thirdparty/dependencies.cmake ++++ b/thirdparty/dependencies.cmake +@@ -318,7 +318,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND + # Note: Debian / Ubuntu / RHEL libprotobuf.a can only be used with -DBUILD_SHARED_LIBS=OFF + # because they are compiled without -fPIC + if(NOT DEFINED Protobuf_USE_STATIC_LIBS) +- set(Protobuf_USE_STATIC_LIBS ON) ++ set(Protobuf_USE_STATIC_LIBS OFF) + endif() + if(CMAKE_VERBOSE_MAKEFILE) + set(Protobuf_DEBUG ON) diff --git a/libraries/openvino/openvino.SlackBuild b/libraries/openvino/openvino.SlackBuild index afaf89b33b7..5f8950efd33 100644 --- a/libraries/openvino/openvino.SlackBuild +++ b/libraries/openvino/openvino.SlackBuild @@ -90,6 +90,9 @@ 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/010-openvino-disable-werror.patch +patch -p1 < $CWD/020-openvino-use-protobuf-shared-libs.patch + # Flatbuffers from SBo provide broken cmake files(static-lib removed but static-lib-cmake-files not removed) ( cd thirdparty/flatbuffers/ diff --git a/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild b/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild index ae255640389..dfc4cdc6fa9 100644 --- a/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild +++ b/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=python3-PyQtWebEngine SRCNAM=${PRGNAM#*-} -VERSION=${VERSION:-5.15.3} +VERSION=${VERSION:-5.15.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -85,21 +85,20 @@ export QT5DIR=/usr/lib${LIBDIRSUFFIX}/qt5 export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" -python3 configure.py \ - --verbose \ - -q /usr/bin/qmake-qt5 \ - --sip=/usr/bin/sip3 \ - --sip-incdir=$(pkg-config --cflags-only-I python3 | sed 's/^-I//') - +sip-build \ + --no-make \ + --api-dir /usr/share/qt5/qsci/api/python +cd build make -make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG +make INSTALL_ROOT="$PKG" install +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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - ChangeLog LICENSE NEWS README \ + ChangeLog LICENSE NEWS README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.info b/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.info index 99722b4769d..dc20f4c0a3e 100644 --- a/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.info +++ b/libraries/python3-PyQtWebEngine/python3-PyQtWebEngine.info @@ -1,8 +1,8 @@ PRGNAM="python3-PyQtWebEngine" -VERSION="5.15.3" +VERSION="5.15.7" HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro" -DOWNLOAD="https://pypi.python.org/packages/source/P/PyQtWebEngine/PyQtWebEngine-5.15.3.tar.gz" -MD5SUM="e346b3ed6c2c9f8d8f8323fcf777f7ae" +DOWNLOAD="https://pypi.python.org/packages/source/P/PyQtWebEngine/PyQtWebEngine-5.15.7.tar.gz" +MD5SUM="a3394e93d8b5077e8355f57d79c2ed58" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/python3-ruamel.yaml.clib/python3-ruamel.yaml.clib.SlackBuild b/libraries/python3-ruamel.yaml.clib/python3-ruamel.yaml.clib.SlackBuild index ea03cf6e354..4ddf41c8b6c 100644 --- a/libraries/python3-ruamel.yaml.clib/python3-ruamel.yaml.clib.SlackBuild +++ b/libraries/python3-ruamel.yaml.clib/python3-ruamel.yaml.clib.SlackBuild @@ -80,7 +80,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 {} \; -python3 -m build --wheel --no-isolation +CFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" python3 -m build --wheel --no-isolation python3 -m installer --destdir "$PKG" dist/*.whl find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/libraries/pytorch/pytorch.SlackBuild b/libraries/pytorch/pytorch.SlackBuild index 00dddeabf04..599dfaf234c 100644 --- a/libraries/pytorch/pytorch.SlackBuild +++ b/libraries/pytorch/pytorch.SlackBuild @@ -92,7 +92,7 @@ cd build unshare -n cmake \ -G Ninja \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=maybe-uninitialized" \ -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DLIBSHM_INSTALL_LIB_SUBDIR="lib$LIBDIRSUFFIX" \ diff --git a/libraries/qt6/README b/libraries/qt6/README deleted file mode 100644 index b73df851a7d..00000000000 --- a/libraries/qt6/README +++ /dev/null @@ -1,39 +0,0 @@ -Qt is a cross-platform application development framework for desktop, -embedded and mobile. Supported Platforms include Linux, OS X, -Windows, VxWorks, QNX, Android, iOS, BlackBerry, Sailfish OS and -others. - -Qt is not a programming language on its own. It is a framework written -in C++. A preprocessor, the MOC (Meta-Object Compiler), is used to -extend the C++ language with features like signals and slots. Before -the compilation step, the MOC parses the source files written in -Qt-extended C++ and generates standard compliant C++ sources from -them. Thus the framework itself and applications/libraries using it -can be compiled by any standard compliant C++ compiler like Clang, -GCC, ICC, MinGW and MSVC. - -Qt6 has a compiler cache option when building. By default, this -behavior is disabled. To enable it, pass CCACHE=ON to the build script. -Unless you are building qt6 multiple times, you should leave this -option OFF. - -Examples are disabled by default. To build them, pass EXAMPLES=ON -to the build script. - -When building Qt's webengine, proprietary codecs are disabled by -default. To enable them, pass PROPRIETARY_CODECS=ON to the build -script. This will make the resulting package non-redistributable. - -Qt6 requires 16GB of RAM to build, and a minimum of 40GB of available -disk storage. Disk storage requirements may increase when built -against optional dependencies. - -Qt6 will autodetect and build against multiple external programs and -libraries. To see a list of optional dependencies, please consult -README.SLACKWARE - -Qt6 can take substantial time to build and ninja automatically uses -all of your cpus power to speed up this process: if for some reason -this ends up trashing the machine on which you are building it you -can export the environment variable CMAKE_BUILD_PARALLEL_LEVEL to -set an appropriate number of parallel jobs. diff --git a/libraries/qt6/README.SLACKWARE b/libraries/qt6/README.SLACKWARE deleted file mode 100644 index 0c4a8679c33..00000000000 --- a/libraries/qt6/README.SLACKWARE +++ /dev/null @@ -1,35 +0,0 @@ -Slackware 15.0's version of clang fails to compile qt6, due to the -following error: - -Linking CXX executable qtbase/lib64/bin/lupdate -/usr/bin/ld: CMakeFiles/lupdate.dir/cpp_clang.cpp.o: undefined - reference to symbol '_ZTIN5clang7tooling21FrontendActionFactoryE' -/usr/bin/ld: /usr/lib64/libclangTooling.so.13: error adding symbols: - DSO missing from command line -clang-13: error: linker command failed with exit code 1 - -To remedy this, Qt provides a prebuilt clang package that we bootstrap -against. - -Qt6 will compile with multiple optional dependencies, such as: - - assimp - (*)db2 - (*)cerence - (*)directfb - (*)gn - (*)interbase - libb2 - (*)litehtml - (*)lttn-ust - mold - postgresql - (*)sensorfw - (*)s-log2 - snappy - (*)tslib - xmlstarlet - - ...and possibly others. - -(*) = not available from SBo at the time of writing. diff --git a/libraries/qt6/desktop/assistant-qt6.desktop b/libraries/qt6/desktop/assistant-qt6.desktop deleted file mode 100644 index 32a48bd1cde..00000000000 --- a/libraries/qt6/desktop/assistant-qt6.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Qt6 Assistant -Comment=Shows Qt6 documentation and examples -Exec=/usr/lib@LIBDIR@/qt6/bin/assistant -Icon=assistant-qt6 -Terminal=false -Type=Application -Categories=Qt;Development;Documentation; diff --git a/libraries/qt6/desktop/designer-qt6.desktop b/libraries/qt6/desktop/designer-qt6.desktop deleted file mode 100644 index 3287bad25f8..00000000000 --- a/libraries/qt6/desktop/designer-qt6.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Qt6 Designer -GenericName=Interface Designer -Comment=Design GUIs for Qt6 applications -Exec=/usr/lib@LIBDIR@/qt6/bin/designer -Icon=designer-qt6 -MimeType=application/x-designer; -Terminal=false -Type=Application -Categories=Qt;Development; diff --git a/libraries/qt6/desktop/linguist-qt6.desktop b/libraries/qt6/desktop/linguist-qt6.desktop deleted file mode 100644 index 837a24cf770..00000000000 --- a/libraries/qt6/desktop/linguist-qt6.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt6 Linguist -Comment=Add translations to Qt6 applications -Exec=/usr/lib@LIBDIR@/qt6/bin/linguist -Icon=linguist-qt6 -MimeType=text/vnd.trolltech.linguist;application/x-linguist; -Terminal=false -Type=Application -Categories=Qt;Development; diff --git a/libraries/qt6/desktop/qdbusviewer-qt6.desktop b/libraries/qt6/desktop/qdbusviewer-qt6.desktop deleted file mode 100644 index 7ec65d117be..00000000000 --- a/libraries/qt6/desktop/qdbusviewer-qt6.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt6 QDbusViewer -GenericName=Qt6 D-Bus Debugger -Comment=Debug D-Bus applications -Exec=/usr/lib@LIBDIR@/qt6/bin/qdbusviewer -Icon=qdbusviewer-qt6 -Terminal=false -Type=Application -Categories=Qt;Development;Debugger; diff --git a/libraries/qt6/doinst.sh b/libraries/qt6/doinst.sh deleted file mode 100644 index 65c7e2eeb9a..00000000000 --- a/libraries/qt6/doinst.sh +++ /dev/null @@ -1,9 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi diff --git a/libraries/qt6/newer_protobuf_1.patch b/libraries/qt6/newer_protobuf_1.patch deleted file mode 100644 index a5f24bf302d..00000000000 --- a/libraries/qt6/newer_protobuf_1.patch +++ /dev/null @@ -1,58 +0,0 @@ -Backported to 6.5.2 from 1a610ab9c7edde2e27ff707c9e534172e288e8ed in v6.7.0-beta1~260 - -https://codereview.qt-project.org/gitweb?p=qt%2Fqtgrpc.git;a=commit;h=1a610ab9c7edde2e27ff707c9e534172e288e8ed - -diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/clientdeclarationprinter.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/clientdeclarationprinter.cpp ---- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/clientdeclarationprinter.cpp 2023-07-07 14:29:20.000000000 +0200 -+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/clientdeclarationprinter.cpp 2024-03-12 08:14:21.885741000 +0100 -@@ -8,7 +8,6 @@ - #include - #include - #include --#include - - #include - #include -diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp ---- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp 2023-07-07 14:29:20.000000000 +0200 -+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp 2024-03-12 08:16:45.956741000 +0100 -@@ -12,11 +12,10 @@ - - #include - #include --#include --#include -+#include - #include - #include --#include -+#include - - using namespace ::QtGrpc; - using namespace ::qtprotoccommon; -diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp ---- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp 2023-07-07 14:29:20.000000000 +0200 -+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp 2024-03-12 08:17:09.574741000 +0100 -@@ -17,7 +17,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotoccommon/generatorbase.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotoccommon/generatorbase.cpp ---- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotoccommon/generatorbase.cpp 2023-07-07 14:29:20.000000000 +0200 -+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotoccommon/generatorbase.cpp 2024-03-12 08:18:20.905741000 +0100 -@@ -5,10 +5,9 @@ - #include "generatorbase.h" - - #include --#include --#include - #include - #include -+#include - - #include "utils.h" - #include "commontemplates.h" diff --git a/libraries/qt6/newer_protobuf_2.patch b/libraries/qt6/newer_protobuf_2.patch deleted file mode 100644 index cfd5277570b..00000000000 --- a/libraries/qt6/newer_protobuf_2.patch +++ /dev/null @@ -1,42 +0,0 @@ -Backported to 6.5.2 from 2297f2da520b7eebe10dd6b5304e5a4c3c18a57c in v6.7.0-beta1~220 - -https://codereview.qt-project.org/gitweb?p=qt/qtgrpc.git;a=commit;h=2297f2da520b7eebe10dd6b5304e5a4c3c18a57c - -diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp ---- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp 2023-07-07 14:29:20.000000000 +0200 -+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtgrpcgen/qgrpcgenerator.cpp 2024-03-12 08:40:27.884741000 +0100 -@@ -32,13 +32,9 @@ - bool QGrpcGenerator::Generate(const FileDescriptor *file, - [[maybe_unused]] const std::string ¶meter, - GeneratorContext *generatorContext, -- std::string *error) const -+ [[maybe_unused]] std::string *error) const - { - assert(file != nullptr && generatorContext != nullptr); -- if (file->syntax() != FileDescriptor::SYNTAX_PROTO3) { -- *error = "Invalid proto used. qtgrpcgen only supports 'proto3' syntax"; -- return false; -- } - - return GenerateClientServices(file, generatorContext); - } -diff -Naur qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp ---- qt-everywhere-src-6.5.2.orig/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp 2023-07-07 14:29:20.000000000 +0200 -+++ qt-everywhere-src-6.5.2/qtgrpc/src/tools/qtprotobufgen/qprotobufgenerator.cpp 2024-03-12 08:42:48.976741000 +0100 -@@ -37,15 +37,10 @@ - bool QProtobufGenerator::Generate(const FileDescriptor *file, - [[maybe_unused]] const std::string ¶meter, - GeneratorContext *generatorContext, -- std::string *error) const -+ [[maybe_unused]] std::string *error) const - { - assert(file != nullptr && generatorContext != nullptr); - -- if (file->syntax() != FileDescriptor::SYNTAX_PROTO3) { -- *error = "Invalid proto used. qtprotobufgen only supports 'proto3' syntax"; -- return false; -- } -- - return GenerateMessages(file, generatorContext); - } - diff --git a/libraries/qt6/profile.d/qt6.csh b/libraries/qt6/profile.d/qt6.csh deleted file mode 100644 index 7764724e0da..00000000000 --- a/libraries/qt6/profile.d/qt6.csh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/csh -# Environment path variables for the Qt package: -if ( ! $?QT6DIR ) then - # It's best to use the generic directory to avoid - # compiling in a version-containing path: - if ( -d /usr/lib@LIBDIRSUFFIX@/qt6 ) then - setenv QT6DIR /usr/lib@LIBDIRSUFFIX@/qt6 - else - # Find the newest Qt directory and set $QT6DIR to that: - foreach qtd ( /usr/lib@LIBDIRSUFFIX@/qt6-* ) - if ( -d $qtd ) then - setenv QT6DIR $qtd - endif - end - endif -endif -set path = ( $path $QT6DIR/bin ) diff --git a/libraries/qt6/profile.d/qt6.sh b/libraries/qt6/profile.d/qt6.sh deleted file mode 100644 index 70ccbc2faf6..00000000000 --- a/libraries/qt6/profile.d/qt6.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# Environment variables for the Qt package. -# -# It's best to use the generic directory to avoid -# compiling in a version-containing path: -if [ -d /usr/lib@LIBDIRSUFFIX@/qt6 ]; then - QT6DIR=/usr/lib@LIBDIRSUFFIX@/qt6 -else - # Find the newest Qt directory and set $QT6DIR to that: - for qtd in /usr/lib@LIBDIRSUFFIX@/qt6-* ; do - if [ -d $qtd ]; then - QT6DIR=$qtd - fi - done -fi -PATH="$PATH:$QT6DIR/bin" -export QT6DIR diff --git a/libraries/qt6/qt6.SlackBuild b/libraries/qt6/qt6.SlackBuild deleted file mode 100644 index 92997fc9050..00000000000 --- a/libraries/qt6/qt6.SlackBuild +++ /dev/null @@ -1,197 +0,0 @@ -#!/bin/bash - -# Slackware build script for qt6 - -# Copyright 2022-2023 Steven Voges -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=qt6 -SRCNAM=qt-everywhere-src -VERSION=${VERSION:-6.5.2} -BSCLANG=libclang-release_130-based-linux-Ubuntu20.04-gcc9.3-x86_64 -CCACHE=${CCACHE:-OFF} -EXAMPLES=${EXAMPLES:-OFF} -LINKED_OPENSSL=${LINKED_OPENSSL:-ON} -PROPRIETARY_CODECS=${PROPRIETARY_CODECS:-OFF} -SYSTEM_FFMPEG=${SYSTEM_FFMPEG:-ON} -SYSTEM_HARFBUZZ=${SYSTEM_HARFBUZZ:-OFF} #Link against qt6's harfbuzz because Slackware 15.0's package is too old -SYSTEM_SQLITE=${SYSTEM_SQLITE:-ON} -SYSTEM_XCB_INPUT=${SYSTEM_XCB_INPUT:-ON} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.xz -cd $SRCNAM-$VERSION -bsdtar xvf $CWD/$BSCLANG.7z -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 {} \; - -patch -p1 < $CWD/newer_protobuf_1.patch -patch -p1 < $CWD/newer_protobuf_2.patch - -#Fix compile on -current/gcc13+ -sed -i '54i #include ' qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp - -export CC=clang -export CXX=clang++ -export CFLAGS="$SLKCFLAGS" - -mkdir -p build -cd build - cmake \ - -G Ninja \ - -Wno-dev \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DClang_DIR=$TMP/$SRCNAM-$VERSION/libclang/lib/cmake/clang \ - -DFEATURE_openssl_linked=$LINKED_OPENSSL \ - -DFEATURE_system_harfbuzz=$SYSTEM_HARFBUZZ \ - -DFEATURE_system_sqlite=$SYSTEM_SQLITE \ - -DFEATURE_system_xcb_xinput=$SYSTEM_XCB_INPUT \ - -DFEATURE_webengine_proprietary_codecs=$PROPRIETARY_CODECS \ - -DFEATURE_webengine_system_ffmpeg=$SYSTEM_FFMPEG \ - -DFEATURE_webengine_system_re2=OFF \ - -DINSTALL_ARCHDATADIR=./lib${LIBDIRSUFFIX} \ - -DINSTALL_BINDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/bin \ - -DINSTALL_DESCRIPTIONSDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/modules \ - -DINSTALL_DOCDIR=./doc/$PRGNAM-$VERSION \ - -DINSTALL_EXAMPLESDIR=./doc/$PRGNAM-$VERSION/examples \ - -DINSTALL_INCLUDEDIR=./include/$PRGNAM \ - -DINSTALL_LIBDIR=./lib${LIBDIRSUFFIX} \ - -DINSTALL_LIBEXECDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/libexec \ - -DINSTALL_MKSPECSDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/mkspecs \ - -DINSTALL_PLUGINSDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/plugins \ - -DINSTALL_QMLDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/qml \ - -DINSTALL_TRANSLATIONSDIR=./share/$PRGNAM/translations \ - -DINSTALL_TESTSDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/tests \ - -DQT_BUILD_EXAMPLES=$EXAMPLES \ - -DQT_USE_CCACHE=$CCACHE \ - -DCMAKE_BUILD_TYPE=Release .. - cmake --build . - DESTDIR=$PKG cmake --install . --strip -cd .. - -rm -R $PKG/usr/lib$LIBDIRSUFFIX/cmake/Qt6/QtBuildInternals -rmdir $PKG/usr/lib$LIBDIRSUFFIX/cmake/Qt6/ios -rmdir $PKG/usr/lib$LIBDIRSUFFIX/cmake/Qt6/macos - -if [ -d "$PKG/usr/phrasebooks" ]; then - mv $PKG/usr/phrasebooks $PKG/usr/share/$PRGNAM/ -fi -if [ -d "$PKG/usr/resources" ]; then - mv $PKG/usr/resources $PKG/usr/share/$PRGNAM/ -fi - -if [ "$EXAMPLES" = "ON" ]; then - find -L $PKG/usr/doc/$PRGNAM-$VERSION/examples \ - -type d -exec chmod 755 {} \; - find -L $PKG/usr/doc/$PRGNAM-$VERSION/examples \ - -type f -exec chmod 644 {} \; -fi - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -for i in $CWD/desktop/*.desktop; do - install -D -m 0644 $i $PKG/usr/share/applications/$(basename $i) -done -sed -i "s|@LIBDIR@|$LIBDIRSUFFIX|" $PKG/usr/share/applications/* - -# Install symlinks to the Qt6 binaries in the $PATH (avoid the ones already ending in "6" or "cmake"): -mkdir -p $PKG/usr/bin -for FILE in $PKG/usr/lib${LIBDIRSUFFIX}/qt6/bin/* ; do - if ! [[ $FILE =~ (6$|cmake$) ]]; then - ln -s ../lib${LIBDIRSUFFIX}/qt6/bin/$(basename $FILE) $PKG/usr/bin/$(basename $FILE)-qt6 - fi -done - -install -D -m 0644 qttools/src/assistant/assistant/images/assistant-128.png \ - $PKG/usr/share/icons/hicolor/128x128/apps/assistant-qt6.png -install -D -m 0644 qttools/src/designer/src/designer/images/designer.png \ - $PKG/usr/share/icons/hicolor/128x128/apps/designer-qt6.png -install -D -m 0644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \ - $PKG/usr/share/icons/hicolor/128x128/apps/qdbusviewer-qt6.png -install -D -m 0644 qttools/src/linguist/linguist/images/icons/linguist-128-32.png \ - $PKG/usr/share/icons/hicolor/128x128/apps/linguist-qt6.png - -mkdir -p $PKG/etc/profile.d -sed -e "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" $CWD/profile.d/$PRGNAM.sh \ - > $PKG/etc/profile.d/$PRGNAM.sh -sed -e "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" $CWD/profile.d/$PRGNAM.csh \ - > $PKG/etc/profile.d/$PRGNAM.csh -chmod 0755 $PKG/etc/profile.d/* - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - .QT-ENTERPRISE-LICENSE-AGREEMENT LICENSE.* README.md \ - $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 -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/qt6/qt6.info b/libraries/qt6/qt6.info deleted file mode 100644 index 5996f1a3175..00000000000 --- a/libraries/qt6/qt6.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="qt6" -VERSION="6.5.2" -HOMEPAGE="https://qt.io" -DOWNLOAD="UNSUPPORTED" -MD5SUM="" -DOWNLOAD_x86_64="https://download.qt.io/official_releases/qt/6.5/6.5.2/single/qt-everywhere-src-6.5.2.tar.xz \ - https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_130-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z" -MD5SUM_x86_64="87f56fd8aedd2e429047c40397e9be48 \ - 1eb94ba35df4aa217cf485086215182a" -REQUIRES="double-conversion html5lib md4c nodejs" -MAINTAINER="Steven Voges" -EMAIL="svoges.sbo@gmail.com" diff --git a/libraries/qt6/slack-desc b/libraries/qt6/slack-desc deleted file mode 100644 index 32c3c864247..00000000000 --- a/libraries/qt6/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------------------------------------------------------| -qt6: qt6 (Application Development Framework) -qt6: -qt6: Qt is a cross-platform application development framework for desktop, -qt6: embedded and mobile. Supported Platforms include Linux, OS X, -qt6: Windows, VxWorks, QNX, Android, iOS, BlackBerry, Sailfish OS and -qt6: others. -qt6: -qt6: Homepage: https://qt.io -qt6: -qt6: -qt6: diff --git a/libraries/quesoglc/quesoglc.SlackBuild b/libraries/quesoglc/quesoglc.SlackBuild index 959f25c2c30..595f180d437 100644 --- a/libraries/quesoglc/quesoglc.SlackBuild +++ b/libraries/quesoglc/quesoglc.SlackBuild @@ -78,7 +78,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 {} \; -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/rrdtool/rrdtool.SlackBuild b/libraries/rrdtool/rrdtool.SlackBuild index 222235f1215..a82f942b7e7 100644 --- a/libraries/rrdtool/rrdtool.SlackBuild +++ b/libraries/rrdtool/rrdtool.SlackBuild @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=rrdtool -VERSION=${VERSION:-1.8.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.9.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/rrdtool/rrdtool.info b/libraries/rrdtool/rrdtool.info index 79c13dd9562..63bc9235ecd 100644 --- a/libraries/rrdtool/rrdtool.info +++ b/libraries/rrdtool/rrdtool.info @@ -1,8 +1,8 @@ PRGNAM="rrdtool" -VERSION="1.8.0" +VERSION="1.9.0" HOMEPAGE="https://www.rrdtool.org/" -DOWNLOAD="https://github.com/oetiker/rrdtool-1.x/releases/download/v1.8.0/rrdtool-1.8.0.tar.gz" -MD5SUM="852754364cbd0703a099b5eb32932851" +DOWNLOAD="https://github.com/oetiker/rrdtool-1.x/releases/download/v1.9.0/rrdtool-1.9.0.tar.gz" +MD5SUM="bcbdb069e74fc866fb92deb6697c5392" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/stfl/stfl.SlackBuild b/libraries/stfl/stfl.SlackBuild index e5edb31bb2b..f41ffbff10e 100644 --- a/libraries/stfl/stfl.SlackBuild +++ b/libraries/stfl/stfl.SlackBuild @@ -67,6 +67,7 @@ patch -p1 < $CWD/allow-custom-opts-in-Makefile.patch # Add proper Python 2/3 support cp -r python python3 patch -p1 < $CWD/python-support.patch +sed -i 's|ncursesw/ncurses.h|ncurses.h|' stfl_internals.h make install \ OPTS="$SLKCFLAGS" \ diff --git a/libraries/tepl/tepl.SlackBuild b/libraries/tepl/tepl.SlackBuild index 6a6195bfca4..8790d5a26db 100644 --- a/libraries/tepl/tepl.SlackBuild +++ b/libraries/tepl/tepl.SlackBuild @@ -81,15 +81,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# circunvent meson version mismtach (fs.copyfile not available) -# avoid gtk_doc, which uses fs.copyfile -# replace unnecesary version bump of gio-2.0 -sed -i "s/meson_version: '>= 0.64'/meson_version: '>= 0.59'/; - s/'gio-2.0', version: '>= 2.74'/'gio-2.0', version: '>= 2.70'/" meson.build - - cd build - CFLAGS="$SLKCFLAGS -DG_CONNECT_DEFAULT=0" \ + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ meson .. \ --buildtype=release \ diff --git a/libraries/tkimg/tkimg.SlackBuild b/libraries/tkimg/tkimg.SlackBuild index 0e55fd2a133..6135a84b8fd 100644 --- a/libraries/tkimg/tkimg.SlackBuild +++ b/libraries/tkimg/tkimg.SlackBuild @@ -25,9 +25,10 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=tkimg -VERSION=${VERSION:-1.4.2} +SRCNAM=Img +VERSION=${VERSION:-1.4.16} MAJVER=1.4 -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +40,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -70,9 +68,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM$MAJVER -tar xvf $CWD/$PRGNAM$VERSION.tar.bz2 -cd $PRGNAM$MAJVER +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION-Source.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -80,7 +78,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 {} \; -make distclean # Disable JBIG support (if left enabled then the build will fail with a # link error for JBIG iff the Slackbuilds jbigkit is already installed # before building tkimg). Note that the result is no JBIG support, but diff --git a/libraries/tkimg/tkimg.info b/libraries/tkimg/tkimg.info index 7d7d383e6af..82f69a8378a 100644 --- a/libraries/tkimg/tkimg.info +++ b/libraries/tkimg/tkimg.info @@ -1,8 +1,8 @@ PRGNAM="tkimg" -VERSION="1.4.2" +VERSION="1.4.16" HOMEPAGE="http://wiki.tcl.tk/1404" -DOWNLOAD="http://download.sourceforge.net/tkimg/tkimg1.4.2.tar.bz2" -MD5SUM="1ccae906cb1c235b114b9736dfb157d6" +DOWNLOAD="http://download.sourceforge.net/tkimg/Img-1.4.16-Source.tar.gz" +MD5SUM="88e74d5b41706d4d97cd0e428ca58979" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="tcllib" diff --git a/libraries/virglrenderer/virglrenderer.SlackBuild b/libraries/virglrenderer/virglrenderer.SlackBuild index 490a3d4888a..af28a5ea95d 100644 --- a/libraries/virglrenderer/virglrenderer.SlackBuild +++ b/libraries/virglrenderer/virglrenderer.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for virglrenderer -# Copyright 2016-2023 Matteo Bernardini , Pisa, Italy +# Copyright 2016-2024 Matteo Bernardini , Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=virglrenderer -VERSION=${VERSION:-0.10.4} +VERSION=${VERSION:-1.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/libraries/virglrenderer/virglrenderer.info b/libraries/virglrenderer/virglrenderer.info index d264746fe58..c5a2d4a842b 100644 --- a/libraries/virglrenderer/virglrenderer.info +++ b/libraries/virglrenderer/virglrenderer.info @@ -1,8 +1,8 @@ PRGNAM="virglrenderer" -VERSION="0.10.4" +VERSION="1.0.1" HOMEPAGE="https://virgil3d.github.io" -DOWNLOAD="https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/0.10.4/virglrenderer-0.10.4.tar.bz2" -MD5SUM="470f34cbd9c7e9422555bf3841f00b7e" +DOWNLOAD="https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/1.0.1/virglrenderer-1.0.1.tar.bz2" +MD5SUM="c3d2785352a8e612858017d61377b74d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/wcslib/README b/libraries/wcslib/README deleted file mode 100644 index 8ea64be5d90..00000000000 --- a/libraries/wcslib/README +++ /dev/null @@ -1,11 +0,0 @@ -WCSLIB is a set of C library routines that implements the World -Coordinate System (WCS) standard in FITS (Flexible Image Transport -System). It comes with support for FORTRAN via a set of wrapper -functions. It also includes a general curvilinear axis drawing -routine, PGSBOX, for PGPLOT. Another included utility program is -HPXcvt, which is used to convert 1D HEALPix pixelization data stored -in a variety of forms in FITS into a 2D primary image array with HPX -or XPH coordinate representation. - -Usage with gcc compiler: use "-lwcs" command line argument for linking -at compile time. diff --git a/libraries/wcslib/slack-desc b/libraries/wcslib/slack-desc deleted file mode 100644 index 2051c374509..00000000000 --- a/libraries/wcslib/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------------------------------------------------------| -wcslib: wcslib (World Coordinate System for FITS) -wcslib: -wcslib: WCSLIB is a C library, supplied with a full set of Fortran wrappers, -wcslib: that implements the World Coordinate System (WCS) standard in FITS -wcslib: (Flexible Image Transport System). It also includes a PGPLOT-based -wcslib: routine, PGSBOX, for drawing general curvilinear coordinate -wcslib: graticules and a number of utility programs. -wcslib: -wcslib: -wcslib: Homepage: http://www.atnf.csiro.au/people/mcalabre/WCS/ -wcslib: diff --git a/libraries/wcslib/wcslib.SlackBuild b/libraries/wcslib/wcslib.SlackBuild deleted file mode 100644 index da958e22132..00000000000 --- a/libraries/wcslib/wcslib.SlackBuild +++ /dev/null @@ -1,124 +0,0 @@ -#!/bin/bash - -# Slackware build script for WCSLib - -# Copyright 2018 Nitish Ragoomundun, Mauritius -# 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. - -# 20220419 bkw: Modified by SlackBuilds.org, BUILD=3: -# - fix dir permissions in package (e.g. usr/man was 0775). -# - get rid of static lib. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=wcslib -VERSION=${VERSION:-7.7} -BUILD=${BUILD:-3} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -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 -chown -R root:root . -find . -type f -exec chmod 0644 {} \+ -find . -type d -exec chmod 0755 {} \+ - -# Paths for PGPLOT in case it is not set properly -#PGPLOT_DIR="/usr/lib${LIBDIRSUFFIX}/pgplot" -#LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib${LIBDIRSUFFIX}/pgplot" - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -sh ./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-cfitsio \ - --with-cfitsiolib=/usr/lib${LIBDIRSUFFIX} \ - --with-cfitsioinc=/usr/include \ - --with-x \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG -gzip -9 $PKG/usr/man/man*/* - -# 20220419 bkw: --disable-static accepted and ignored, so: -rm -f $PKG/usr/lib*/*.a - -# Give root write permission on regular files as many of them get 444 -# permissions by default. -# 20220419 bkw: also, a lot of the directories are 775. -find $PKG -type f -exec chmod u+w {} \+ -find $PKG -type d -exec chmod 0755 {} \+ - -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 -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -rm -f $PKG/usr/lib*/*.la - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/wcslib/wcslib.info b/libraries/wcslib/wcslib.info deleted file mode 100644 index 9c830a0366d..00000000000 --- a/libraries/wcslib/wcslib.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="wcslib" -VERSION="7.7" -HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/" -DOWNLOAD="ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-7.7.tar.bz2" -MD5SUM="958a8e10cf01b7fb7c9340952fc79cd0" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Nitish Ragoomundun" -EMAIL="lrugratz@gmail.com" diff --git a/libraries/wxsvg/gcc13.patch b/libraries/wxsvg/gcc13.patch deleted file mode 100644 index fdc57958dd5..00000000000 --- a/libraries/wxsvg/gcc13.patch +++ /dev/null @@ -1,31 +0,0 @@ -From https://gcc.gnu.org/gcc-13/porting_to.html - -Some C++ Standard Library headers have been changed to no longer -include other headers that were being used internally by the library. -As such, C++ programs that used standard library components without -including the right headers will no longer compile. - -The following headers are used less widely in libstdc++ and may need -to be included explicitly when compiling with GCC 13: - - (for std::string, std::to_string, std::stoi etc.) - (for std::error_code, std::error_category, std::system_error). - (for std::int8_t, std::int32_t etc.) - (for std::printf, std::fopen etc.) - (for std::strtol, std::malloc etc.) - -- - -Matteo Bernardini - -diff -Naur wxsvg-1.5.24.orig/src/cairo/SVGCanvasCairo.cpp wxsvg-1.5.24/src/cairo/SVGCanvasCairo.cpp ---- wxsvg-1.5.24.orig/src/cairo/SVGCanvasCairo.cpp 2022-08-31 16:56:26.000000000 +0200 -+++ wxsvg-1.5.24/src/cairo/SVGCanvasCairo.cpp 2023-04-27 22:23:05.069420000 +0200 -@@ -14,6 +14,7 @@ - #include "SVGCanvasImageCairo.h" - #include - #include -+#include - - wxSVGCanvasCairo::~wxSVGCanvasCairo() { - Destroy(); diff --git a/libraries/wxsvg/wxsvg.SlackBuild b/libraries/wxsvg/wxsvg.SlackBuild index 3f09fe593da..f17e9f7a0f5 100644 --- a/libraries/wxsvg/wxsvg.SlackBuild +++ b/libraries/wxsvg/wxsvg.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for wxsvg -# Copyright 2013-2022 Matteo Bernardini , Pisa, Italy +# Copyright 2013-2024 Matteo Bernardini , Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=wxsvg -VERSION=${VERSION:-1.5.24} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.5.25} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -79,9 +76,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/gcc13.patch - -sh autogen.sh || true +sed -i 's/libwxsvg_la_LDFLAGS = /libwxsvg_la_LDFLAGS = $(LDFLAGS) /' src/Makefile.am +autoreconf -fi CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -96,6 +92,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-shared \ --build=$ARCH-slackware-linux +sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make make install DESTDIR=$PKG diff --git a/libraries/wxsvg/wxsvg.info b/libraries/wxsvg/wxsvg.info index 338ea9ccb4b..e90228d7eb5 100644 --- a/libraries/wxsvg/wxsvg.info +++ b/libraries/wxsvg/wxsvg.info @@ -1,8 +1,8 @@ PRGNAM="wxsvg" -VERSION="1.5.24" +VERSION="1.5.25" HOMEPAGE="https://sourceforge.net/projects/wxsvg/" -DOWNLOAD="https://downloads.sf.net/wxsvg/wxsvg-1.5.24.tar.bz2" -MD5SUM="4f6780ef38bed0f7a7b6bb8d6499f405" +DOWNLOAD="https://downloads.sf.net/wxsvg/wxsvg-1.5.25.tar.bz2" +MD5SUM="1fe9e2fa330fccefb8b6149aafef5bf0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="wxWidgets" diff --git a/libraries/zstd-cmake/README b/libraries/zstd-cmake/README deleted file mode 100644 index 3ddefa5f004..00000000000 --- a/libraries/zstd-cmake/README +++ /dev/null @@ -1,2 +0,0 @@ -This is only the cmake files meant to compliment the zstd package -already in Slackware. diff --git a/libraries/zstd-cmake/slack-desc b/libraries/zstd-cmake/slack-desc deleted file mode 100644 index 9adf2daff37..00000000000 --- a/libraries/zstd-cmake/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------------------------------------------------------| -zstd-cmake: zstd-cmake (cmake files for zstd) -zstd-cmake: -zstd-cmake: Provide the cmake files necessary for cmake to find zstd. -zstd-cmake: -zstd-cmake: Homepage: http://www.zstd.net -zstd-cmake: -zstd-cmake: -zstd-cmake: -zstd-cmake: -zstd-cmake: -zstd-cmake: diff --git a/libraries/zstd-cmake/zstd-cmake.SlackBuild b/libraries/zstd-cmake/zstd-cmake.SlackBuild deleted file mode 100644 index 81098203a32..00000000000 --- a/libraries/zstd-cmake/zstd-cmake.SlackBuild +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/bash - -# Slackware build script for zstd-cmake - -# Copyright 2022-2023 Steven Voges -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=zstd-cmake -SRCNAM=zstd -VERSION=${VERSION:-1.5.5} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$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/cmake/build -cd build/cmake/build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DZSTD_BUILD_PROGRAMS=OFF \ - -DZSTD_BUILD_STATIC=OFF \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install/strip DESTDIR=$PKG -cd ../../.. - -rm -r $PKG/usr/include -rm -r $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig -rm $PKG/usr/lib$LIBDIRSUFFIX/libzstd.* -sed -i 's/${_IMPORT_PREFIX}\//\//g' \ - $PKG/usr/lib${LIBDIRSUFFIX}/cmake/$SRCNAM/${SRCNAM}Targets-release.cmake - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - *.md CHANGELOG COPYING 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 diff --git a/libraries/zstd-cmake/zstd-cmake.info b/libraries/zstd-cmake/zstd-cmake.info deleted file mode 100644 index 51061140f64..00000000000 --- a/libraries/zstd-cmake/zstd-cmake.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="zstd-cmake" -VERSION="1.5.5" -HOMEPAGE="http://www.zstd.net" -DOWNLOAD="https://github.com/facebook/zstd/archive/v1.5.5/zstd-1.5.5.tar.gz" -MD5SUM="4ff0ee1965ab161bc55be7c9dcd1f7f9" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Steven Voges" -EMAIL="svoges.sbo@gmail.com" diff --git a/libraries/zxing-cpp/README b/libraries/zxing-cpp/README deleted file mode 100644 index 7e7c2ad1d07..00000000000 --- a/libraries/zxing-cpp/README +++ /dev/null @@ -1,20 +0,0 @@ -ZXing-C++ ("zebra crossing") is an open-source, multi-format -linear/matrix barcode image processing library implemented in C++. - -It was originally ported from the Java ZXing Library but has been -developed further and now includes many improvements in terms of -runtime and detection performance. It can both read and write -barcodes in a number of formats. - -Features: - * Written in pure C++17 (/C++20), no third-party dependencies - (for the library itself) - * Thread safe - * Wrappers/Bindings for: - - Android - - C - - iOS - - Python - - WebAssembly - - WinRT - - Flutter (external project) diff --git a/libraries/zxing-cpp/slack-desc b/libraries/zxing-cpp/slack-desc deleted file mode 100644 index 2211be0a137..00000000000 --- a/libraries/zxing-cpp/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------------------------------------------------------| -zxing-cpp: zxing-cpp (barcode image processing library) -zxing-cpp: -zxing-cpp: ZXing-C++ ("zebra crossing") is an open-source, multi-format -zxing-cpp: linear/matrix barcode image processing library implemented in C++. -zxing-cpp: It can both read and write barcodes in a number of formats. -zxing-cpp: -zxing-cpp: Homepage: https://github.com/zxing-cpp/zxing-cpp -zxing-cpp: -zxing-cpp: -zxing-cpp: -zxing-cpp: diff --git a/libraries/zxing-cpp/zxing-cpp.SlackBuild b/libraries/zxing-cpp/zxing-cpp.SlackBuild deleted file mode 100644 index d5acf0cfcd8..00000000000 --- a/libraries/zxing-cpp/zxing-cpp.SlackBuild +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/bash - -# Slackware build script for zxing-cpp - -# Copyright 2023 Bloyburt -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cd $(dirname $0) ; CWD=$(pwd) - -PRGNAM=zxing-cpp -VERSION=${VERSION:-2.2.1} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} -STBVER=${STBVER:-03f50e343d796e492e6579a11143a085429d7f5d} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "aarch64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -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 - -# Use a local version of the stb image library -patch zxing.cmake $CWD/zxing.cmake.patch -cp -a $CWD/stb-$STBVER.tar.gz . -tar xvf stb-$STBVER.tar.gz -mv stb-$STBVER stb-src - -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_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX="$LIBDIRSUFFIX" \ - -DMAN_INSTALL_DIR=/usr/man \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install/strip DESTDIR=$PKG -cd .. - -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 -cp -a LICENSE README.md $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 diff --git a/libraries/zxing-cpp/zxing-cpp.info b/libraries/zxing-cpp/zxing-cpp.info deleted file mode 100644 index 17e51a38e27..00000000000 --- a/libraries/zxing-cpp/zxing-cpp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="zxing-cpp" -VERSION="2.2.1" -HOMEPAGE="https://github.com/zxing-cpp/zxing-cpp" -DOWNLOAD="https://github.com/zxing-cpp/zxing-cpp/archive/v2.2.1/zxing-cpp-2.2.1.tar.gz https://github.com/nothings/stb/archive/03f50e3/stb-03f50e343d796e492e6579a11143a085429d7f5d.tar.gz" -MD5SUM="8d2b1592668c57f77c6351c8bb5fe739 6c2059b2728abb6da1d93ec52eaddd9c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Bloyburt" -EMAIL="alexpen@startmail.com" diff --git a/libraries/zxing-cpp/zxing.cmake.patch b/libraries/zxing-cpp/zxing.cmake.patch deleted file mode 100644 index c7fc316223d..00000000000 --- a/libraries/zxing-cpp/zxing.cmake.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- zxing.cmake.orig 2023-11-10 19:38:55.601450169 +0000 -+++ zxing.cmake 2023-11-10 19:39:15.889449494 +0000 -@@ -12,11 +12,8 @@ - - if (NOT STB_FOUND) - include(FetchContent) -- FetchContent_Declare (stb -- GIT_REPOSITORY https://github.com/nothings/stb.git) -- FetchContent_MakeAvailable (stb) - add_library(stb::stb INTERFACE IMPORTED) -- target_include_directories(stb::stb INTERFACE ${stb_SOURCE_DIR}) -+ target_include_directories(stb::stb INTERFACE ../stb-src) - else() - add_library(stb::stb ALIAS PkgConfig::STB) - endif() diff --git a/misc/discount/discount.SlackBuild b/misc/discount/discount.SlackBuild index 3a2a165330e..e8b54905c0f 100644 --- a/misc/discount/discount.SlackBuild +++ b/misc/discount/discount.SlackBuild @@ -73,6 +73,9 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + +# https://github.com/Orc/discount/issues/283 +patch -p1 < $CWD/gcc14.patch + # Disable ldconfig use during 'make install' sed -i 's/LDCONFIG=.*$/LDCONFIG=true/g' configure.inc diff --git a/misc/discount/gcc14.patch b/misc/discount/gcc14.patch new file mode 100644 index 00000000000..31cd780bc1b --- /dev/null +++ b/misc/discount/gcc14.patch @@ -0,0 +1,41 @@ +--- + main.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +Index: discount-2.2.7d/main.c +=================================================================== +--- discount-2.2.7d.orig/main.c ++++ discount-2.2.7d/main.c +@@ -100,14 +100,15 @@ free_it(char *object, void *ctx) + } + + char * +-external_codefmt(char *src, int len, char *lang) ++external_codefmt(const char *src, const int len, void *lang) + { + int extra = 0; + int i, x; + char *res; ++ char *ec_lang = (char *)lang; + +- if ( lang == 0 ) +- lang = "generic_code"; ++ if ( ec_lang == 0 ) ++ ec_lang = "generic_code"; + + for ( i=0; i < len; i++) { + if ( src[i] == '&' ) +@@ -117,11 +118,11 @@ external_codefmt(char *src, int len, cha + } + + /* 80 characters for the format wrappers */ +- if ( (res = malloc(len+extra+80+strlen(lang))) ==0 ) ++ if ( (res = malloc(len+extra+80+strlen(ec_lang))) ==0 ) + /* out of memory? drat! */ + return 0; + +- sprintf(res, "
\n", lang);
++    sprintf(res, "
\n", ec_lang);
+     x = strlen(res);
+     for ( i=0; i < len; i++ ) {
+ 	switch (src[i]) {
diff --git a/misc/fcitx5-chinese-addons/README b/misc/fcitx5-chinese-addons/README
deleted file mode 100644
index 2cb365fe594..00000000000
--- a/misc/fcitx5-chinese-addons/README
+++ /dev/null
@@ -1,7 +0,0 @@
-fcitx5-chinese-addons provides pinyin and table input method support
-for fcitx5. Released under LGPL-2.1+.
-
-im/pinyin/emoji.txt is derived from Unicode CLDR with modification.
-
-If you want to build this package with Qt6, please set -DUSE_QT6 to
-On instead of Off in the SlackBuild.
diff --git a/misc/fcitx5-chinese-addons/doinst.sh b/misc/fcitx5-chinese-addons/doinst.sh
deleted file mode 100644
index ca71fd3c40f..00000000000
--- a/misc/fcitx5-chinese-addons/doinst.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
-
-if [ -e usr/share/glib-2.0/schemas ]; then
-  if [ -x /usr/bin/glib-compile-schemas ]; then
-    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
-  fi
-fi
-
diff --git a/misc/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild b/misc/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild
deleted file mode 100644
index 70d3b84dd69..00000000000
--- a/misc/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/bash
-
-# Copyright 2022-2023  Wen-Wei Kao (ltlnx), Taichung, Taiwan
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=fcitx5-chinese-addons
-VERSION=${VERSION:-5.1.7}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-${VERSION}_dict.tar.*
-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_CXX_FLAGS="${SLKCFLAGS}" \
-    -DCMAKE_C_FLAGS="${SLKCFLAGS}" \
-    -DCMAKE_INSTALL_PREFIX="/usr" \
-    -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
-    -DUSE_QT6=Off \
-    -DENABLE_TEST=Off ..
-  make
-  make install/strip DESTDIR=$PKG
-cd ..
-
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-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
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSES/* $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
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/misc/fcitx5-chinese-addons/fcitx5-chinese-addons.info b/misc/fcitx5-chinese-addons/fcitx5-chinese-addons.info
deleted file mode 100644
index 3faaf633600..00000000000
--- a/misc/fcitx5-chinese-addons/fcitx5-chinese-addons.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fcitx5-chinese-addons"
-VERSION="5.1.7"
-HOMEPAGE="https://github.com/fcitx/fcitx5-chinese-addons"
-DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/fcitx5-chinese-addons-5.1.7_dict.tar.zst"
-MD5SUM="6fbbf5d356886d4c33c9faffbaa18b56"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="fcitx5-qt libime"
-MAINTAINER="ltlnx"
-EMAIL="ltlnx@disroot.org"
diff --git a/misc/fcitx5-chinese-addons/slack-desc b/misc/fcitx5-chinese-addons/slack-desc
deleted file mode 100644
index 01fc72e5f1a..00000000000
--- a/misc/fcitx5-chinese-addons/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------------------------------------------------------|
-fcitx5-chinese-addons: fcitx5-chinese-addons (Chinese related addon for fcitx5)
-fcitx5-chinese-addons:
-fcitx5-chinese-addons: This provides pinyin and table input method support for fcitx5. 
-fcitx5-chinese-addons: Released under LGPL-2.1+.
-fcitx5-chinese-addons:
-fcitx5-chinese-addons:
-fcitx5-chinese-addons:
-fcitx5-chinese-addons:
-fcitx5-chinese-addons:
-fcitx5-chinese-addons: Homepage: https://github.com/fcitx/fcitx5-chinese-addons
-fcitx5-chinese-addons:
diff --git a/misc/fcitx5-configtool/README b/misc/fcitx5-configtool/README
deleted file mode 100644
index 7d1edfbab70..00000000000
--- a/misc/fcitx5-configtool/README
+++ /dev/null
@@ -1,10 +0,0 @@
-Fcitx5-configtool provides the configuration GUI for Fcitx5.
-
-Do note that although this package could be installed along with the 
-bundled kcm-fcitx, they are considered conflicting packages in some
-other distros (like Arch), so depending on your situation, you may
-uninstall and blacklist kcm-fcitx before installing this package.
-
-Building with Qt6 is turned off by default. If you want to use the
-Qt6 version, simply change -DUSE_QT6=Off into -DUSE_QT6=On in the
-SlackBuild.
diff --git a/misc/fcitx5-configtool/doinst.sh b/misc/fcitx5-configtool/doinst.sh
deleted file mode 100644
index 5fb28930db0..00000000000
--- a/misc/fcitx5-configtool/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
diff --git a/misc/fcitx5-configtool/fcitx5-configtool.SlackBuild b/misc/fcitx5-configtool/fcitx5-configtool.SlackBuild
deleted file mode 100644
index 55e6c3885fc..00000000000
--- a/misc/fcitx5-configtool/fcitx5-configtool.SlackBuild
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/bash
-
-# Copyright 2022-2023  Wen-Wei Kao (ltlnx), Taichung, Taiwan
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=fcitx5-configtool
-VERSION=${VERSION:-5.1.7}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.*
-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_CXX_FLAGS="${SLKCFLAGS}" \
-    -DCMAKE_C_FLAGS="${SLKCFLAGS}" \
-    -DCMAKE_INSTALL_PREFIX="/usr" \
-    -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
-    -DUSE_QT6=Off ..
-  make
-  make install/strip DESTDIR=$PKG
-cd ..
-
-# patch desktop file to conform with standards
-if [ -f $PKG/usr/share/applications/kcm_fcitx5.desktop ]; then
-  sed -i 's/True/true/g' $PKG/usr/share/applications/kcm_fcitx5.desktop
-fi
-
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-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
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSES/* $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
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/misc/fcitx5-configtool/fcitx5-configtool.info b/misc/fcitx5-configtool/fcitx5-configtool.info
deleted file mode 100644
index 4780363f82e..00000000000
--- a/misc/fcitx5-configtool/fcitx5-configtool.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fcitx5-configtool"
-VERSION="5.1.7"
-HOMEPAGE="https://github.com/fcitx/fcitx5-configtool"
-DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configtool-5.1.7.tar.zst"
-MD5SUM="e29b5141d753c7b6720ba4b3ecf2d0e5"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="fcitx5-qt"
-MAINTAINER="ltlnx"
-EMAIL="ltlnx@disroot.org"
diff --git a/misc/fcitx5-configtool/slack-desc b/misc/fcitx5-configtool/slack-desc
deleted file mode 100644
index 663a547c507..00000000000
--- a/misc/fcitx5-configtool/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------------------------------------------------------|
-fcitx5-configtool: fcitx5-configtool (Configuration Tool for Fcitx5)
-fcitx5-configtool:
-fcitx5-configtool: Configuration Tool for Fcitx5.
-fcitx5-configtool:
-fcitx5-configtool: Homepage: https://fcitx-im.org/wiki/Fcitx_5
-fcitx5-configtool:
-fcitx5-configtool:
-fcitx5-configtool:
-fcitx5-configtool:
-fcitx5-configtool:
-fcitx5-configtool:
diff --git a/misc/fcitx5-gtk/README b/misc/fcitx5-gtk/README
deleted file mode 100644
index aa8eaf0727d..00000000000
--- a/misc/fcitx5-gtk/README
+++ /dev/null
@@ -1,15 +0,0 @@
-fcitx5-gtk provides the GTK IM modules and libraries for fcitx5.
-
-If you enable GObject Introspection (via the ENABLE_GIR CMake
-variable), make install will install some files to the system's GIR
-directories regardless of what CMAKE_INSTALL_PREFIX is set to.
-
-If you have installed it to a custom prefix, you'll need to update the
-GTK input method module cache. This is done by invoking
-gtk-query-immodules-3.0 (or gtk-query-immodules-3.0 for GTK 2) and
-setting GTK_PATH to point at fcitx5-gtk's GTK library install path
-beforehand. For example:
-
-    GTK_PATH=/your/install/path/lib/gtk-3.0 gtk-query-immodules-3.0 \
-        --update-cache
-
diff --git a/misc/fcitx5-gtk/fcitx5-gtk.SlackBuild b/misc/fcitx5-gtk/fcitx5-gtk.SlackBuild
deleted file mode 100644
index f77904e4412..00000000000
--- a/misc/fcitx5-gtk/fcitx5-gtk.SlackBuild
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/bash
-
-# Copyright 2022  Wen-Wei Kao (ltlnx), Taichung, Taiwan
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=fcitx5-gtk
-VERSION=${VERSION:-5.1.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.*
-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_CXX_FLAGS="${SLKCFLAGS}" \
-    -DCMAKE_C_FLAGS="${SLKCFLAGS}" \
-    -DCMAKE_INSTALL_PREFIX="/usr" \
-    -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} ..
-  make
-  make install/strip DESTDIR=$PKG
-cd ..
-
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-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
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSES/* README* $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
diff --git a/misc/fcitx5-gtk/fcitx5-gtk.info b/misc/fcitx5-gtk/fcitx5-gtk.info
deleted file mode 100644
index 73b70d18744..00000000000
--- a/misc/fcitx5-gtk/fcitx5-gtk.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fcitx5-gtk"
-VERSION="5.1.3"
-HOMEPAGE="https://github.com/fcitx/fcitx5-gtk"
-DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-gtk/fcitx5-gtk-5.1.3.tar.zst"
-MD5SUM="bf9b13f976b1eded294d5764ccc0d484"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="fcitx5"
-MAINTAINER="ltlnx"
-EMAIL="ltlnx@disroot.org"
diff --git a/misc/fcitx5-gtk/slack-desc b/misc/fcitx5-gtk/slack-desc
deleted file mode 100644
index 5cd05489ead..00000000000
--- a/misc/fcitx5-gtk/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------------------------------------------------------|
-fcitx5-gtk: fcitx5-gtk (Gtk IM modules and DBus client library for fcitx5)
-fcitx5-gtk:
-fcitx5-gtk: Gtk IM module for fcitx5 and glib based dbus client library.
-fcitx5-gtk:
-fcitx5-gtk: Homepage: https://fcitx-im.org/wiki/Fcitx_5
-fcitx5-gtk:
-fcitx5-gtk:
-fcitx5-gtk:
-fcitx5-gtk:
-fcitx5-gtk:
-fcitx5-gtk:
diff --git a/misc/fcitx5-mozc/0013-mozc-includes.patch b/misc/fcitx5-mozc/0013-mozc-includes.patch
new file mode 100644
index 00000000000..b437f24e8b2
--- /dev/null
+++ b/misc/fcitx5-mozc/0013-mozc-includes.patch
@@ -0,0 +1,20 @@
+--- third_party/abseil-cpp/absl/strings/internal/str_format/float_conversion.cc	2023-09-05 17:36:23.973250174 +0900
++++ third_party/abseil-cpp/absl/strings/internal/str_format/float_conversion.cc	2023-09-05 17:37:06.585477262 +0900
+@@ -5,6 +5,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ 
+--- third_party/abseil-cpp/absl/strings/internal/str_format/extension.h	2023-09-05 17:45:04.104106229 +0900
++++ third_party/abseil-cpp/absl/strings/internal/str_format/extension.h	2023-09-05 17:45:24.484098612 +0900
+@@ -20,6 +20,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #include "absl/base/config.h"
diff --git a/misc/fcitx5-mozc/fcitx5-mozc.SlackBuild b/misc/fcitx5-mozc/fcitx5-mozc.SlackBuild
index 2d679c9fced..eb7836e0548 100644
--- a/misc/fcitx5-mozc/fcitx5-mozc.SlackBuild
+++ b/misc/fcitx5-mozc/fcitx5-mozc.SlackBuild
@@ -165,6 +165,9 @@ cd src/
 # Build with gcc instead of clang
 echo "... Apply 0012-mozc-build-gcc.patch"
 patch -p1 < $CWD/0012-mozc-build-gcc.patch
+# gcc-13 compatibility
+echo "... Apply 0013-mozc-includes.patch"
+patch -p0 < $CWD/0013-mozc-includes.patch
 
 # Fix compatibility with google-glog 0.3.3 (symbol conflict)
 CFLAGS="${CFLAGS} -fvisibility=hidden"
diff --git a/misc/fcitx5-qt/README b/misc/fcitx5-qt/README
deleted file mode 100644
index f72b87998b7..00000000000
--- a/misc/fcitx5-qt/README
+++ /dev/null
@@ -1,23 +0,0 @@
-fcitx5-qt is the Qt im-module for fcitx5 and it needs to be installed
-in order to use fcitx5 with Qt-based applications. It currently
-supports Qt4, Qt5 and Qt6.
-
-You'll need several Qt modules if you're going to enable Qt5/Qt6
-support, namely QtCore, QtDbus, QtWidgets and QtX11Extras. Qt5 is
-bundled in Slackware, and if you want Qt6 support you're on your
-own; but any app that requires Qt6 on SBo at this point should have
-already pulled all the dependencies in. 
-
-Relevant CMake options are ENABLE_QT4, ENABLE_QT5 and ENABLE_QT6.
-Only ENABLE_QT5 is turned on by default. You might want to turn the
-flags on/off depending on the Qt version you are using. To enable Qt4,
-you need to modify
-
-  -DENABLE_QT4=Off \
-
-from "Off" to "On". Similarly, to turn on Qt6 support, turn
-
-  -DENABLE_QT6=On \
-  -DENABLE_QT6_WAYLAND_WORKAROUND=On ..
-
-from "Off" to "On".
diff --git a/misc/fcitx5-qt/doinst.sh b/misc/fcitx5-qt/doinst.sh
deleted file mode 100644
index 5fb28930db0..00000000000
--- a/misc/fcitx5-qt/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
diff --git a/misc/fcitx5-qt/fcitx5-qt.SlackBuild b/misc/fcitx5-qt/fcitx5-qt.SlackBuild
deleted file mode 100644
index 02c38ea3abe..00000000000
--- a/misc/fcitx5-qt/fcitx5-qt.SlackBuild
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/bash
-
-# Copyright 2022-2023  Wen-Wei Kao (ltlnx), Taichung, Taiwan
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=fcitx5-qt
-VERSION=${VERSION:-5.1.8}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.*
-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_CXX_FLAGS="${SLKCFLAGS}" \
-    -DCMAKE_C_FLAGS="${SLKCFLAGS}" \
-    -DCMAKE_INSTALL_PREFIX="/usr" \
-    -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
-    -DENABLE_QT4=Off \
-    -DENABLE_QT6=Off \
-    -DENABLE_QT6_WAYLAND_WORKAROUND=Off ..
-  make
-  make install/strip DESTDIR=$PKG
-cd ..
-
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-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
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSES/* README* $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
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/misc/fcitx5-qt/fcitx5-qt.info b/misc/fcitx5-qt/fcitx5-qt.info
deleted file mode 100644
index 6613a0e4d07..00000000000
--- a/misc/fcitx5-qt/fcitx5-qt.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fcitx5-qt"
-VERSION="5.1.8"
-HOMEPAGE="https://github.com/fcitx/fcitx5-qt"
-DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-qt/fcitx5-qt-5.1.8.tar.zst"
-MD5SUM="08acb9c850ac7d9bd9a332d8bfae006e"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="fcitx5"
-MAINTAINER="ltlnx"
-EMAIL="ltlnx@disroot.org"
diff --git a/misc/fcitx5-qt/slack-desc b/misc/fcitx5-qt/slack-desc
deleted file mode 100644
index 701a0d8e044..00000000000
--- a/misc/fcitx5-qt/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------------------------------------------------------|
-fcitx5-qt: fcitx5-qt (Qt libraries for Fcitx5)
-fcitx5-qt:
-fcitx5-qt: Qt library and IM module for fcitx5
-fcitx5-qt:
-fcitx5-qt: Homepage: https://fcitx-im.org/wiki/Fcitx_5
-fcitx5-qt:
-fcitx5-qt:
-fcitx5-qt:
-fcitx5-qt:
-fcitx5-qt:
-fcitx5-qt:
diff --git a/misc/fcitx5-table-extra/README b/misc/fcitx5-table-extra/README
deleted file mode 100644
index a65ebaddbf0..00000000000
--- a/misc/fcitx5-table-extra/README
+++ /dev/null
@@ -1,13 +0,0 @@
-fcitx5-table-extra provides extra table for Fcitx5, including Boshiamy,
-Zhengma, Cangjie, and Quick.
-
-Zhengma's patent is expired at 2009.
-Boshiamy's patent is expired at 2003.11.11.
-Cangjie's author drop Cangjie's patent in 1982.
-
-The code of this package are released under GPLv3 or later.
-
-All the data file is now in public domain.
-
-For expired patent references, see the original README on the website:
-https://github.com/fcitx/fcitx5-table-extra
diff --git a/misc/fcitx5-table-extra/doinst.sh b/misc/fcitx5-table-extra/doinst.sh
deleted file mode 100644
index ca71fd3c40f..00000000000
--- a/misc/fcitx5-table-extra/doinst.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
-
-if [ -e usr/share/glib-2.0/schemas ]; then
-  if [ -x /usr/bin/glib-compile-schemas ]; then
-    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
-  fi
-fi
-
diff --git a/misc/fcitx5-table-extra/fcitx5-table-extra.SlackBuild b/misc/fcitx5-table-extra/fcitx5-table-extra.SlackBuild
deleted file mode 100644
index d18c6b04d97..00000000000
--- a/misc/fcitx5-table-extra/fcitx5-table-extra.SlackBuild
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-# Copyright 2022  Wen-Wei Kao (ltlnx), Taichung, Taiwan
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=fcitx5-table-extra
-VERSION=${VERSION:-5.1.6}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-ARCH=noarch
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-${VERSION}.tar.*
-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_INSTALL_PREFIX="/usr" \
-    -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} ..
-  make
-  make install/strip DESTDIR=$PKG
-cd ..
-
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-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
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSES/* $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
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/misc/fcitx5-table-extra/fcitx5-table-extra.info b/misc/fcitx5-table-extra/fcitx5-table-extra.info
deleted file mode 100644
index 3fc9dcaad52..00000000000
--- a/misc/fcitx5-table-extra/fcitx5-table-extra.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fcitx5-table-extra"
-VERSION="5.1.6"
-HOMEPAGE="https://github.com/fcitx/fcitx5-table-extra"
-DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/fcitx5-table-extra-5.1.6.tar.zst"
-MD5SUM="9ad3f797b57cadf0ebfff74254de3e69"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libime fcitx5"
-MAINTAINER="ltlnx"
-EMAIL="ltlnx@disroot.org"
diff --git a/misc/fcitx5-table-extra/slack-desc b/misc/fcitx5-table-extra/slack-desc
deleted file mode 100644
index 5c5f7326859..00000000000
--- a/misc/fcitx5-table-extra/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------------------------------------------------------|
-fcitx5-table-extra: fcitx5-table-extra (Extra table input methods for fcitx5)
-fcitx5-table-extra:
-fcitx5-table-extra: fcitx5-table-extra provides extra table for Fcitx5, including
-fcitx5-table-extra: Boshiamy, Zhengma, Cangjie, and Quick.
-fcitx5-table-extra:
-fcitx5-table-extra:
-fcitx5-table-extra:
-fcitx5-table-extra:
-fcitx5-table-extra:
-fcitx5-table-extra: Homepage: https://github.com/fcitx/fcitx5-table-extra
-fcitx5-table-extra:
diff --git a/misc/fcitx5-table-other/README b/misc/fcitx5-table-other/README
deleted file mode 100644
index 85f68343b74..00000000000
--- a/misc/fcitx5-table-other/README
+++ /dev/null
@@ -1,7 +0,0 @@
-fcitx-table-other provides some other tables for Fcitx, fork from
-ibus-table-others, scim-tables.
-
-Most of the table in this package is non-Chinese table. They are listed
-under /tables by language.
-
-The package is released under GPLv3+.
diff --git a/misc/fcitx5-table-other/doinst.sh b/misc/fcitx5-table-other/doinst.sh
deleted file mode 100644
index ca71fd3c40f..00000000000
--- a/misc/fcitx5-table-other/doinst.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
-
-if [ -e usr/share/glib-2.0/schemas ]; then
-  if [ -x /usr/bin/glib-compile-schemas ]; then
-    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
-  fi
-fi
-
diff --git a/misc/fcitx5-table-other/fcitx5-table-other.SlackBuild b/misc/fcitx5-table-other/fcitx5-table-other.SlackBuild
deleted file mode 100644
index 9a865c45959..00000000000
--- a/misc/fcitx5-table-other/fcitx5-table-other.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/bash
-
-# Copyright 2022  Wen-Wei Kao (ltlnx), Taichung, Taiwan
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=fcitx5-table-other
-VERSION=${VERSION:-5.1.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-ARCH=noarch
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-${VERSION}.tar.*
-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_CXX_FLAGS="${SLKCFLAGS}" \
-    -DCMAKE_C_FLAGS="${SLKCFLAGS}" \
-    -DCMAKE_INSTALL_PREFIX="/usr" \
-    -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} ..
-  make
-  make install/strip DESTDIR=$PKG
-cd ..
-
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-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
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSES/* $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
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/misc/fcitx5-table-other/fcitx5-table-other.info b/misc/fcitx5-table-other/fcitx5-table-other.info
deleted file mode 100644
index 053fb0fb56e..00000000000
--- a/misc/fcitx5-table-other/fcitx5-table-other.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fcitx5-table-other"
-VERSION="5.1.3"
-HOMEPAGE="https://github.com/fcitx/fcitx5-table-other"
-DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5-table-other/fcitx5-table-other-5.1.3.tar.zst"
-MD5SUM="c2e45b5c637b196fb7368c34a52ba381"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libime fcitx5"
-MAINTAINER="ltlnx"
-EMAIL="ltlnx@disroot.org"
diff --git a/misc/fcitx5-table-other/slack-desc b/misc/fcitx5-table-other/slack-desc
deleted file mode 100644
index 600f1a9a4a9..00000000000
--- a/misc/fcitx5-table-other/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------------------------------------------------------|
-fcitx5-table-other: fcitx5-table-other (Some other tables for fcitx5)
-fcitx5-table-other:
-fcitx5-table-other: fcitx-table-other provides some other tables for Fcitx, fork from 
-fcitx5-table-other: ibus-table-others, scim-tables.
-fcitx5-table-other:
-fcitx5-table-other: Most of the table in this package is non-Chinese table. They are
-fcitx5-table-other: listed under /tables by language.
-fcitx5-table-other:
-fcitx5-table-other:
-fcitx5-table-other: Homepage: https://github.com/fcitx/fcitx5-table-other
-fcitx5-table-other:
diff --git a/misc/fcitx5/README b/misc/fcitx5/README
deleted file mode 100644
index bd043ee1478..00000000000
--- a/misc/fcitx5/README
+++ /dev/null
@@ -1,37 +0,0 @@
-Fcitx is an input method framework with extension support. Currently it
-supports Linux and Unix systems like freebsd. Fcitx supports typing
-with many languages all over the world with a large number of engines.
-
-Fcitx has a slim core while provides powerful features with addons. It
-is easy to customize fcitx to satisfy your own needs. 
-
-Fcitx5 is the next generation of fcitx.
-
-Some cmake options to keep in mind before building are:
-
-- ENABLE_WAYLAND: Wayland support. Defaults to On and should be fine
-  for desktop environments such as KDE and GNOME. Users running
-  X11-based window managers will need to turn it off.
-
-- ENABLE_ENCHANT: Enchant support. Defaults to On. Used for word
-  prediction (hinting). Depends on libenchant, which is provided by
-  most distributions.
-
-The user is encouraged to check the contents of CMakeLists.txt for an
-exhaustive list of options.
-
-For example, an i3 user who wishes to install it to /opt would run
-(likely with sudo privileges):
-
-    cmake -DENABLE_WAYLAND=Off \
-        -DCMAKE_INSTALL_PREFIX=/your/install/path .
-    make
-    sudo make install
-
-To make fcitx5 the default input method, please add these lines to your
-/etc/environment (or .profile):
-
-    GTK_IM_MODULE=fcitx
-    QT_IM_MODULE=fcitx
-    XMODIFIERS=@im=fcitx
-
diff --git a/misc/fcitx5/doinst.sh b/misc/fcitx5/doinst.sh
deleted file mode 100644
index 138e27de17a..00000000000
--- a/misc/fcitx5/doinst.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
-
-if [ -x /usr/bin/update-mime-database ]; then
-  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
diff --git a/misc/fcitx5/fcitx5-autostart b/misc/fcitx5/fcitx5-autostart
deleted file mode 100644
index 22d8c056d33..00000000000
--- a/misc/fcitx5/fcitx5-autostart
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-START="no"
-
-if [ "$XIM" = "fcitx" ]; then
-  START="yes"
-fi
-
-if [ "$XIM_PROGRAM" = "fcitx" ]; then
-  START="yes"
-fi
-
-if [ "$GTK_IM_MODULE" = "fcitx" ]; then
-  START="yes"
-fi
-
-if [ "$QT_IM_MODULE" = "fcitx" ]; then
-  START="yes"
-fi
-
-if [ "$START" = "no" ]; then
-  exit 0
-fi
-
-# sleep for a little while to avoid duplicate startup
-sleep 2
-
-# Test whether fcitx is running correctly with dbus...
-fcitx5-remote > /dev/null 2>&1
-
-if [ $? = "1" ]; then
-    echo "Fcitx seems is not running"
-    fcitx5
-else
-    echo "Fcitx is running correctly."
-fi
diff --git a/misc/fcitx5/fcitx5.SlackBuild b/misc/fcitx5/fcitx5.SlackBuild
deleted file mode 100644
index 3c48c184e69..00000000000
--- a/misc/fcitx5/fcitx5.SlackBuild
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/bash
-
-# Copyright 2022-2023  Wen-Wei Kao (ltlnx), Taichung, Taiwan
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=fcitx5
-VERSION=${VERSION:-5.1.11}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-${VERSION}_dict.tar.*
-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_CXX_FLAGS="${SLKCFLAGS}" \
-    -DCMAKE_C_FLAGS="${SLKCFLAGS}" \
-    -DCMAKE_INSTALL_PREFIX="/usr" \
-    -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} ..
-  make
-  make install/strip DESTDIR=$PKG
-cd ..
-
-
-# Use our own autostart script to autostart fcitx5
-install -m 755 $CWD/fcitx5-autostart $PKG/usr/bin/
-sed -i "s|Exec=/usr/bin/fcitx5|Exec=/usr/bin/fcitx5-autostart|" \
-  $PKG/etc/xdg/autostart/org.fcitx.Fcitx5.desktop
-
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-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
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSES/* README* $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
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/misc/fcitx5/fcitx5.info b/misc/fcitx5/fcitx5.info
deleted file mode 100644
index 3065ba433a7..00000000000
--- a/misc/fcitx5/fcitx5.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="fcitx5"
-VERSION="5.1.11"
-HOMEPAGE="https://fcitx-im.org/wiki/Fcitx_5"
-DOWNLOAD="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-5.1.11_dict.tar.zst"
-MD5SUM="92970d75566e2dd51db602209f86a1bf"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="fmt xcb-imdkit"
-MAINTAINER="ltlnx"
-EMAIL="ltlnx@disroot.org"
diff --git a/misc/fcitx5/slack-desc b/misc/fcitx5/slack-desc
deleted file mode 100644
index eaccae7994f..00000000000
--- a/misc/fcitx5/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------------------------------------------------------|
-fcitx5: fcitx5 (Input Method Framework)
-fcitx5:
-fcitx5: Fcitx is an input method framework with extension support. Currently
-fcitx5: it supports Linux and Unix systems like freebsd. It has three built-
-fcitx5: in Input Method Engine, Pinyin, QuWei and Table-based input methods.
-fcitx5: Fcitx tries to provide a native feeling under all desktop as well as
-fcitx5: a light weight core. You can easily customize it to fit your
-fcitx5: requirements.
-fcitx5:
-fcitx5: Homepage: https://fcitx-im.org/wiki/Fcitx_5
-fcitx5:
diff --git a/misc/projectM/projectM.SlackBuild b/misc/projectM/projectM.SlackBuild
index 2d8a69608ed..8611d4e0309 100644
--- a/misc/projectM/projectM.SlackBuild
+++ b/misc/projectM/projectM.SlackBuild
@@ -25,7 +25,9 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=projectM
-VERSION=${VERSION:-3.1.12}
+VERSION=${VERSION:-4.1.2}
+SRCNAM2=projectm-eval
+VERSION2=${VERSION2:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -73,6 +75,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+tar xvf $CWD/$SRCNAM2-$VERSION2.tar.gz --strip-components=1 -C $SRCNAM-$VERSION/vendor/$SRCNAM2
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -81,22 +84,18 @@ 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 {} \;
 
-./autogen.sh
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-static \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
 
 # Don't ship .la files:
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
@@ -104,9 +103,6 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 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
 
-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 AUTHORS.txt LICENSE.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/misc/projectM/projectM.info b/misc/projectM/projectM.info
index 0c4b035b141..6ee7522a06a 100644
--- a/misc/projectM/projectM.info
+++ b/misc/projectM/projectM.info
@@ -1,8 +1,10 @@
 PRGNAM="projectM"
-VERSION="3.1.12"
+VERSION="4.1.2"
 HOMEPAGE="https://github.com/projectM-visualizer/projectm"
-DOWNLOAD="https://github.com/projectM-visualizer/projectm/archive/v3.1.12/projectm-3.1.12.tar.gz"
-MD5SUM="8b583aa05d1ab66985fa89d593b480d5"
+DOWNLOAD="https://github.com/projectM-visualizer/projectm/archive/v4.1.2/projectm-4.1.2.tar.gz \
+          https://github.com/projectM-visualizer/projectm-eval/archive/v1.0.0/projectm-eval-1.0.0.tar.gz"
+MD5SUM="74a5d37f7344bd32e5a9d04eb02a1fb4 \
+        1142c430117cd1b9db321a1d25398f23"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/seahorse-plugins/README b/misc/seahorse-plugins/README
deleted file mode 100644
index 0473d6abe39..00000000000
--- a/misc/seahorse-plugins/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This package provides plugins for the Seahorse application.
-Scrollkeeper and Epiphany support are disabled in this SlackBuild.
diff --git a/misc/seahorse-plugins/doinst.sh b/misc/seahorse-plugins/doinst.sh
deleted file mode 100644
index 6c4d26e292d..00000000000
--- a/misc/seahorse-plugins/doinst.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-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
-}
-
-schema_install seahorse-plugins.schemas
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -x /usr/bin/update-mime-database ]; then
-  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
-
diff --git a/misc/seahorse-plugins/seahorse-plugins.SlackBuild b/misc/seahorse-plugins/seahorse-plugins.SlackBuild
deleted file mode 100644
index a2e67837d5a..00000000000
--- a/misc/seahorse-plugins/seahorse-plugins.SlackBuild
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for 
-
-# Written by Andrew Rowland 
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM='seahorse-plugins'
-VERSION=${VERSION:-20150521_3781393eac}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-gnome-doc-prepare --force
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./autogen.sh \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-scrollkeeper \
-  --disable-update-mime-database \
-  --disable-epiphany \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-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
-cp -a \
-  AUTHORS ChangeLog COPYING* HACKING INSTALL MAINTAINERS NEWS README THANKS \
-  $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
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/misc/seahorse-plugins/seahorse-plugins.info b/misc/seahorse-plugins/seahorse-plugins.info
deleted file mode 100644
index e31433fa000..00000000000
--- a/misc/seahorse-plugins/seahorse-plugins.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="seahorse-plugins"
-VERSION="20150521_3781393eac"
-HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse/Plugins"
-DOWNLOAD="https://harrier.slackbuilds.org/misc/seahorse-plugins-20150521_3781393eac.tar.xz"
-MD5SUM="d9bb36048c3b1fc727383e107a94dcec"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="gnome-common libcryptui seahorse"
-MAINTAINER="Andrew Rowland"
-EMAIL="darowland@ieee.org"
diff --git a/misc/seahorse-plugins/slack-desc b/misc/seahorse-plugins/slack-desc
deleted file mode 100644
index 209e9cbcb74..00000000000
--- a/misc/seahorse-plugins/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------------------------------------------------------|
-seahorse-plugins: seahorse-plugins (plugins for Seahorse)
-seahorse-plugins:
-seahorse-plugins: Plugins for the Seahorse application.
-seahorse-plugins:
-seahorse-plugins:
-seahorse-plugins:
-seahorse-plugins:
-seahorse-plugins:
-seahorse-plugins:
-seahorse-plugins:
-seahorse-plugins:
diff --git a/misc/slop/slop.SlackBuild b/misc/slop/slop.SlackBuild
index 49feb48510e..ac60c667c2c 100644
--- a/misc/slop/slop.SlackBuild
+++ b/misc/slop/slop.SlackBuild
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=slop
-VERSION=${VERSION:-7.5}
+VERSION=${VERSION:-7.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
diff --git a/misc/slop/slop.info b/misc/slop/slop.info
index ea090f15646..8f359db9232 100644
--- a/misc/slop/slop.info
+++ b/misc/slop/slop.info
@@ -1,8 +1,8 @@
 PRGNAM="slop"
-VERSION="7.5"
+VERSION="7.6"
 HOMEPAGE="https://github.com/naelstrof/slop"
-DOWNLOAD="https://github.com/naelstrof/slop/archive/v7.5/slop-7.5.tar.gz"
-MD5SUM="d8ba3c332f801f19c2bd66014d79e988"
+DOWNLOAD="https://github.com/naelstrof/slop/archive/v7.6/slop-7.6.tar.gz"
+MD5SUM="381851df1007fc60cc473b3c8c6a81a9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="glm"
diff --git a/misc/xcb-imdkit/README b/misc/xcb-imdkit/README
deleted file mode 100644
index a9aaa693677..00000000000
--- a/misc/xcb-imdkit/README
+++ /dev/null
@@ -1,8 +0,0 @@
-xcb-imdkit is an implementation of the xim protocol in xcb. Compared
-with the implementation of IMDkit with Xlib, and xim inside Xlib, it
-has a smaller memory footprint, better performance, and is safer on
-malformed clients. And not to say it's all asynchronous and it works
-with xcb.
-
-To build this project, you need: libxcb, xcb-util, xcb-util-keysym,
-which are all included in a full Slackware installation.
diff --git a/misc/xcb-imdkit/slack-desc b/misc/xcb-imdkit/slack-desc
deleted file mode 100644
index 73fec52ff78..00000000000
--- a/misc/xcb-imdkit/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------------------------------------------------------|
-xcb-imdkit: xcb-imdkit (implementation of the xim protocol in xcb)
-xcb-imdkit:
-xcb-imdkit: xcb-imdkit is an implementation of the xim protocol in xcb. Compared
-xcb-imdkit: with the implementation of IMDkit with Xlib, and xim inside Xlib, it
-xcb-imdkit: has a smaller memory footprint, better performance, and is safer on
-xcb-imdkit: malformed clients. And not to say it's all asynchronous and it works
-xcb-imdkit: with xcb.
-xcb-imdkit:
-xcb-imdkit: Homepage: https://github.com/fcitx/xcb-imdkit
-xcb-imdkit:
-xcb-imdkit:
diff --git a/misc/xcb-imdkit/xcb-imdkit.SlackBuild b/misc/xcb-imdkit/xcb-imdkit.SlackBuild
deleted file mode 100644
index 2e5cf1ae27a..00000000000
--- a/misc/xcb-imdkit/xcb-imdkit.SlackBuild
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/bash
-
-# Copyright 2022  Wen-Wei Kao (ltlnx), Taichung, Taiwan
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=xcb-imdkit
-VERSION=${VERSION:-1.0.9}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.*
-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_CXX_FLAGS="${SLKCFLAGS}" \
-    -DCMAKE_C_FLAGS="${SLKCFLAGS}" \
-    -DCMAKE_INSTALL_PREFIX="/usr" \
-    -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} ..
-  make
-  make install/strip DESTDIR=$PKG
-cd ..
-
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-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
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSES/* README* $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
diff --git a/misc/xcb-imdkit/xcb-imdkit.info b/misc/xcb-imdkit/xcb-imdkit.info
deleted file mode 100644
index ba6888b6798..00000000000
--- a/misc/xcb-imdkit/xcb-imdkit.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="xcb-imdkit"
-VERSION="1.0.9"
-HOMEPAGE="https://github.com/fcitx/xcb-imdkit"
-DOWNLOAD="https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-1.0.9.tar.zst"
-MD5SUM="617b72f1dc02fa7aad3d19a837220f00"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="ltlnx"
-EMAIL="ltlnx@disroot.org"
diff --git a/multimedia/aegisub/aegisub-3.3.3-support-icu-75.patch b/multimedia/aegisub/aegisub-3.3.3-support-icu-75.patch
new file mode 100644
index 00000000000..0773a019c4b
--- /dev/null
+++ b/multimedia/aegisub/aegisub-3.3.3-support-icu-75.patch
@@ -0,0 +1,26 @@
+From 5ef040ffe2fc743ecff0d744b82a24e5c9b521a8 Mon Sep 17 00:00:00 2001
+From: Nick Sarnie 
+Date: Thu, 8 Aug 2024 17:21:31 -0400
+Subject: [PATCH] Fix build with icu 75
+
+Signed-off-by: Nick Sarnie 
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 197d0a788..02cb56052 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -144,7 +144,7 @@ AS_IF([test x$enable_compiler_flags != xno], [
+   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing"
+ 
+   # For mac compiler which still stuck on c++98
+-  AC_CXX_FLAG([-std=c++11])
++  AC_CXX_FLAG([-std=c++17])
+ 
+   # -O* messes with debugging.
+   AS_IF([test x$enable_debug = xyes], [
+-- 
+2.45.2
+
diff --git a/multimedia/aegisub/aegisub.SlackBuild b/multimedia/aegisub/aegisub.SlackBuild
index 40eb1b08d76..ccfcbf85703 100644
--- a/multimedia/aegisub/aegisub.SlackBuild
+++ b/multimedia/aegisub/aegisub.SlackBuild
@@ -80,6 +80,7 @@ find -L . \
 
 # Patch for current
 patch -p1 < $CWD/boost-1.81.0.patch
+patch -p1 < $CWD/aegisub-3.3.3-support-icu-75.patch
 
 autoreconf -fiv
 LDFLAGS="$LDFLAGS -lz" \
diff --git a/multimedia/aom/README b/multimedia/aom/README
deleted file mode 100644
index dbddf20cbb0..00000000000
--- a/multimedia/aom/README
+++ /dev/null
@@ -1,7 +0,0 @@
-AOMedia Video 1 (AV1) is an Open Source video codec designed for
-video transmission over the Internet. AV1 is planned to surpass
-VP9 and also to eventually be a competitor with HEVC/H.265.
-
-This script builds the encoder aomenc, the decoder aomdec as well
-as shared libraries which can be utilised by suitable versions of
-both FFmpeg and vlc.
diff --git a/multimedia/aom/aom.SlackBuild b/multimedia/aom/aom.SlackBuild
deleted file mode 100644
index 1045d3e0a34..00000000000
--- a/multimedia/aom/aom.SlackBuild
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/bash
-# ----------------------------------------------------------------------
-# Slackware build script for aom
-#
-# Copyright (c) 2018-2023 Andrew Strong, Blue Mountains, Australia.
-#
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
-#
-#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-#   SUCH DAMAGE.
-# ----------------------------------------------------------------------
-
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=aom
-# The 'official' archive for the aom 3.6.0 release has the git commit in
-# the filename, so adjustments are required for a sane Slackware build:
-VERSION=${VERSION:-3.6.0}
-GITCOMMIT=${GITCOMMIT:-3c65175b1972da4a1992c1dae2365b48d13f9a8d}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir -p $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$GITCOMMIT.tar.gz -C $TMP/$PRGNAM-$VERSION
-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 {} \;
-
-cd build
-
-  # I don't build either the HTML or the Latex docs as IMHO at this stage
-  # of aom development they are still not terribly useful for non-developers.
-  # To enable these docs change '-DENABLE_DOCS=0' below to '1' to build
-  # the docs and then uncomment the 'extra docs' section below to install them...
-
-  cmake \
-    -G "Unix Makefiles" \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
-    -DCMAKE_INSTALL_INCLUDEDIR=include \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DENABLE_NASM=1 \
-    -DENABLE_DOCS=0 \
-    -DBUILD_SHARED_LIBS=1 \
-    -DENABLE_TESTS=0 \
-    ../
-  make -j1
-  make install DESTDIR=$PKG
-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
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CHANGELOG LICENSE PATENTS README.md Sample.cfg $PKG/usr/doc/$PRGNAM-$VERSION
-
-# These are the 'extra docs', more details above...
-# mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{html,latex}
-# cp -a build/docs/html/* $PKG/usr/doc/$PRGNAM-$VERSION/html
-# cp -a build/docs/latex/* $PKG/usr/doc/$PRGNAM-$VERSION/latex
-
-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
diff --git a/multimedia/aom/aom.info b/multimedia/aom/aom.info
deleted file mode 100644
index 815f7823825..00000000000
--- a/multimedia/aom/aom.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="aom"
-VERSION="3.6.0"
-HOMEPAGE="https://aomedia.googlesource.com/aom"
-DOWNLOAD="http://www.andrews-corner.org/downloads/aom-3c65175b1972da4a1992c1dae2365b48d13f9a8d.tar.gz"
-MD5SUM="4c73a44a710688e8c496b3740ecee84b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Andrew Strong"
-EMAIL="andrew.david.strong@gmail.com"
diff --git a/multimedia/aom/slack-desc b/multimedia/aom/slack-desc
deleted file mode 100644
index 981c25fff9d..00000000000
--- a/multimedia/aom/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------------------------------------------------------|
-aom: aom (Open Source Video Codec)
-aom:
-aom: AOMedia Video 1 (AV1) is designed to be the successor to VP9 and
-aom: also to eventually be a direct competitor for HEVC/H.265.
-aom: This Slackbuild builds the 'reference' encoder aomenc as well as
-aom: the 'reference' decoder aomdec.
-aom:
-aom: Homepage: https://aomedia.googlesource.com/aom
-aom:
-aom:
-aom:
diff --git a/multimedia/avidemux/README b/multimedia/avidemux/README
index 39e6cb56a16..75d853d6d1e 100644
--- a/multimedia/avidemux/README
+++ b/multimedia/avidemux/README
@@ -4,5 +4,5 @@ compatible MPEG files, MP4 and ASF, using a variety of codecs. Tasks
 can be automated using projects, job queue and powerful scripting
 capabilities.
 
-Optional dependencies are aften, amrnb, jack, nv-codec-headers,
-and x265.
+Optional dependencies are aften, amrnb, jack, nv-codec-headers, x265
+and vapoursynth.
diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild
index 37202fb9d31..d26ca15b18c 100644
--- a/multimedia/avidemux/avidemux.SlackBuild
+++ b/multimedia/avidemux/avidemux.SlackBuild
@@ -5,7 +5,7 @@
 # Derived from a SlackBuild by Eric Hameleers.
 # Copyright 2009, 2010, 2011, 2013  Eric Hameleers, Eindhoven, NL
 # Copyright 2015 John Vogel Corning, NY USA
-# Copyright 2017-2022 Matteo Bernardini, Pisa, IT
+# Copyright 2017-2024 Matteo Bernardini, Pisa, IT
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -31,7 +31,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=avidemux
-VERSION=${VERSION:-2.8.1}
+VERSION=${VERSION:-20240826_e002176}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -75,7 +75,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf ${PRGNAM}_${VERSION}
-tar xvf $CWD/${PRGNAM}_${VERSION}.tar.gz
+tar xvf $CWD/${PRGNAM}_${VERSION}.tar.?z
 cd ${PRGNAM}_${VERSION}
 chown -R root:root .
 find -L . \
@@ -87,7 +87,6 @@ find -L . \
 # Thanks FreeBSD guys!
 [[ "$ARCH" = "i586" ]] && patch -p0 < $CWD/extra-patch-i386-nosse.patch
 
-sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5|' bootStrap.bash || exit 1
 sed -i 's|0.19|1.0|' avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt || exit 1
 
 bash bootStrap.bash --with-core --with-cli --with-plugins
diff --git a/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info
index 948c45dcc61..ac1830cedec 100644
--- a/multimedia/avidemux/avidemux.info
+++ b/multimedia/avidemux/avidemux.info
@@ -1,8 +1,8 @@
 PRGNAM="avidemux"
-VERSION="2.8.1"
+VERSION="20240826_e002176"
 HOMEPAGE="http://avidemux.org"
-DOWNLOAD="http://downloads.sf.net/avidemux/avidemux_2.8.1.tar.gz"
-MD5SUM="fee41934cba460ec0fde2a453d5a6307"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/avidemux_20240826_e002176.tar.xz"
+MD5SUM="36a3e632e39de29976c4dc197ed2550c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="faac faad2 libdca x264 xvidcore"
diff --git a/multimedia/ccextractor/ccextractor.SlackBuild b/multimedia/ccextractor/ccextractor.SlackBuild
index 8e072caee8f..7ac1170764e 100644
--- a/multimedia/ccextractor/ccextractor.SlackBuild
+++ b/multimedia/ccextractor/ccextractor.SlackBuild
@@ -98,8 +98,8 @@ cd build
     -DMAN_INSTALL_DIR=/usr/man \
     -DWITHOUT_RUST=ON \
     -DWITH_OCR=ON \
-    -DWITH_HARDSUBX=ON \
-    -DWITH_FFMPEG=ON \
+    -DWITH_HARDSUBX=OFF \
+    -DWITH_FFMPEG=OFF \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install/strip DESTDIR=$PKG
diff --git a/multimedia/cinelerra/cinelerra.SlackBuild b/multimedia/cinelerra/cinelerra.SlackBuild
index 1d88525bc00..424392f9a91 100644
--- a/multimedia/cinelerra/cinelerra.SlackBuild
+++ b/multimedia/cinelerra/cinelerra.SlackBuild
@@ -28,7 +28,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=cinelerra
-VERSION=${VERSION:-20210331_eabda9c}
+VERSION=${VERSION:-20231006_bfc2f6c}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -88,6 +88,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 {} \;
 
+sed -i "s|ffplay|ffplay --disable-htmlpages|" thirdparty/Makefile
+
 ./autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/multimedia/cinelerra/cinelerra.info b/multimedia/cinelerra/cinelerra.info
index 296f02857fd..74df7b48e85 100644
--- a/multimedia/cinelerra/cinelerra.info
+++ b/multimedia/cinelerra/cinelerra.info
@@ -1,8 +1,8 @@
 PRGNAM="cinelerra"
-VERSION="20210331_eabda9c"
+VERSION="20231006_bfc2f6c"
 HOMEPAGE="https://cinelerra-gg.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/cinelerra-gg-20210331_eabda9c.tar.xz"
-MD5SUM="fd7a1f289192a8f1f77d0a494f8f204b"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/cinelerra-gg-20231006_bfc2f6c.tar.xz"
+MD5SUM="1d496163396c4f5dc427cbbd7748fb90"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="faac faad2 libavc1394 libdv libiec61883 mjpegtools x264"
diff --git a/multimedia/dvdstyler/dvdstyler.SlackBuild b/multimedia/dvdstyler/dvdstyler.SlackBuild
index ec5f94bf5af..66b221f4780 100644
--- a/multimedia/dvdstyler/dvdstyler.SlackBuild
+++ b/multimedia/dvdstyler/dvdstyler.SlackBuild
@@ -85,6 +85,8 @@ if [ -f /usr/include/libavfilter/buffersink.h ]; then
   sed -i "s|vsink_buffer\.h|buffersink.h|" src/mediatrc_ffmpeg.cpp || exit 1
 fi
 
+patch -p1 < $CWD/ffmpeg-7.patch
+
 sh autogen.sh || true
 
 CFLAGS="$SLKCFLAGS" \
diff --git a/multimedia/dvdstyler/ffmpeg-7.patch b/multimedia/dvdstyler/ffmpeg-7.patch
new file mode 100644
index 00000000000..e4d8458b91d
--- /dev/null
+++ b/multimedia/dvdstyler/ffmpeg-7.patch
@@ -0,0 +1,147 @@
+https://sourceforge.net/p/dvdstyler/DVDStyler/ci/4e8e4aae705a9c4c7958e584015c4c1e222e96c8/
+
+--- a/src/mediaenc_ffmpeg.cpp
++++ b/src/mediaenc_ffmpeg.cpp
+@@ -30,6 +30,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ }
+ 
+@@ -297,8 +298,14 @@
+ 	c->bit_rate = 64000;
+ 	c->sample_rate = 48000;
+ 	c->sample_fmt = sampleFmt;
+-	c->channels = 2;
+-	c->channel_layout = AV_CH_LAYOUT_STEREO;
++
++	AVChannelLayout chLayoutStereo;
++	av_channel_layout_default(&chLayoutStereo, 2);
++	if (av_channel_layout_copy(&c->ch_layout, &chLayoutStereo)) {
++		wxLogError("Failed to set 2 channels");
++		return false;
++	}
++
+ 	if (m_audioStm && avcodec_parameters_from_context(m_audioStm->codecpar, c) < 0) {
+ 		wxLogError("Failed to copy encoder parameters to output audio stream");
+ 		return false;
+@@ -306,7 +313,7 @@
+ 
+ 	
+ 	if (avcodec_open2(c, encoder, NULL) < 0) {
+-		wxLogError(wxT("Could not open audio codec"));
++		wxLogError("Could not open audio codec");
+ 		return false;
+ 	}
+ 	
+@@ -318,7 +325,10 @@
+ 
+ 	m_audioFrame->nb_samples = c->frame_size;
+ 	m_audioFrame->format = c->sample_fmt;
+-	m_audioFrame->channel_layout = c->channel_layout;
++	if (av_channel_layout_copy(&m_audioFrame->ch_layout, &c->ch_layout) < 0) {
++		wxLogError("Could not open copy channel layout");
++		return false;
++	}
+ 		
+ 	int ret = av_frame_get_buffer(m_audioFrame, 0); // allocate the data buffers
+ 	if (ret < 0) {
+@@ -328,7 +338,7 @@
+ 	ret = av_frame_make_writable(m_audioFrame);
+ 	if (ret < 0)
+ 		return false;
+-	for (int i = 0; i < c->channels; i++) {
++	for (int i = 0; i < c->ch_layout.nb_channels; i++) {
+ 		uint16_t *samples = (uint16_t*)m_audioFrame->data[i];
+ 		if (samples) {
+ 		memset(samples, 0, c->frame_size * av_get_bytes_per_sample(c->sample_fmt));
+@@ -494,30 +504,29 @@
+ }
+ 
+ bool wxFfmpegMediaEncoder::writeAudioFrame() {
+-	AVPacket pkt = { 0 }; // data and size must be 0;
+-	int got_packet;
+-
+-	av_init_packet(&pkt);
++	AVPacket* pkt = av_packet_alloc();
+ 	AVCodecContext *c = m_audioCodec;
+ 	
+ 	m_audioFrame->pts = m_nextAudioPts;
+ 	m_nextAudioPts += m_audioFrame->nb_samples;
+-	encode(c, &pkt, m_audioFrame, &got_packet);
++
++	int got_packet = 0;
++	encode(c, pkt, m_audioFrame, &got_packet);
+ 	if (!got_packet) {
+-		av_packet_unref(&pkt);
++		av_packet_unref(pkt);
+ 		return true;
+ 	}
+ 
+-	pkt.stream_index = m_audioStm->index; 
++	pkt->stream_index = m_audioStm->index;
+ 	
+ 	// write the compressed frame in the media file
+-	int ret = av_interleaved_write_frame(m_outputCtx, &pkt);
++	int ret = av_interleaved_write_frame(m_outputCtx, pkt);
+ 	if (ret < 0) {
+-		av_packet_unref(&pkt);
++		av_packet_unref(pkt);
+ 		print_error("Error while writing audio frame", ret);
+ 		return false;
+ 	}
+-	av_packet_unref(&pkt);
++	av_packet_unref(pkt);
+ 	return true;
+ }
+ 
+@@ -526,34 +535,33 @@
+ 	
+ 	// encode the image
+ 	m_picture->pts = m_nextVideoPts++;
+-	AVPacket pkt;
+-	av_init_packet(&pkt);
+-	pkt.data = m_videoOutbuf;
+-	pkt.size = VIDEO_BUF_SIZE;
++	AVPacket* pkt = av_packet_alloc();
++	pkt->data = m_videoOutbuf;
++	pkt->size = VIDEO_BUF_SIZE;
+ 	
+ 	int got_packet = 0;
+-	int ret = encode(c, &pkt, m_picture, &got_packet);
++	int ret = encode(c, pkt, m_picture, &got_packet);
+ 	if (ret < 0) {
+-		av_packet_unref(&pkt);
++		av_packet_unref(pkt);
+ 		print_error("Error while writing video frame", ret);
+ 		return false;
+ 	}
+ 	if (got_packet) {
+-		if (pkt.pts != (int64_t) AV_NOPTS_VALUE)
+-			pkt.pts = av_rescale_q(pkt.pts, c->time_base, m_videoStm->time_base);
+-		if (pkt.dts != (int64_t) AV_NOPTS_VALUE)
+-			pkt.dts = av_rescale_q(pkt.dts, c->time_base, m_videoStm->time_base);
+-		pkt.stream_index = m_videoStm->index;
++		if (pkt->pts != (int64_t) AV_NOPTS_VALUE)
++			pkt->pts = av_rescale_q(pkt->pts, c->time_base, m_videoStm->time_base);
++		if (pkt->dts != (int64_t) AV_NOPTS_VALUE)
++			pkt->dts = av_rescale_q(pkt->dts, c->time_base, m_videoStm->time_base);
++		pkt->stream_index = m_videoStm->index;
+ 		
+ 		// write the compressed frame in the media file
+-		ret = av_interleaved_write_frame(m_outputCtx, &pkt);
++		ret = av_interleaved_write_frame(m_outputCtx, pkt);
+ 		if (ret < 0) {
+-			av_packet_unref(&pkt);
++			av_packet_unref(pkt);
+ 			print_error("Error while writing video frame", ret);
+ 			return false;
+ 		}
+ 	}
+-	av_packet_unref(&pkt);
++	av_packet_unref(pkt);
+ 	return true;
+ }
+ 
diff --git a/multimedia/gmidimonitor/gmidimonitor.SlackBuild b/multimedia/gmidimonitor/gmidimonitor.SlackBuild
index 0cfcd90a56a..a4797eb23cd 100644
--- a/multimedia/gmidimonitor/gmidimonitor.SlackBuild
+++ b/multimedia/gmidimonitor/gmidimonitor.SlackBuild
@@ -79,6 +79,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+sed -i "s|env\ python|env python2|" waf
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./waf configure --prefix=/usr/
diff --git a/multimedia/gpac/ffmpeg7.patch b/multimedia/gpac/ffmpeg7.patch
new file mode 100644
index 00000000000..f3838f0effc
--- /dev/null
+++ b/multimedia/gpac/ffmpeg7.patch
@@ -0,0 +1,86 @@
+From 18863aa2176e423dae2a6d7e39ff6ed6a37b2b78 Mon Sep 17 00:00:00 2001
+From: Deniz Ugur <7467169+DenizUgur@users.noreply.github.com>
+Date: Tue, 8 Oct 2024 21:41:05 -0400
+Subject: [PATCH] fix: private fields were removed in libavformat >= 61
+
+---
+ src/filters/ff_dmx.c | 41 ++++++++++++++---------------------------
+ 1 file changed, 14 insertions(+), 27 deletions(-)
+
+diff --git a/src/filters/ff_dmx.c b/src/filters/ff_dmx.c
+index 540eb80fc1..a612bee571 100644
+--- a/src/filters/ff_dmx.c
++++ b/src/filters/ff_dmx.c
+@@ -2204,7 +2204,6 @@ char *dev_desc = NULL;
+ static void ffavin_enum_devices(const char *dev_name, Bool is_audio)
+ {
+ 	const AVInputFormat *fmt;
+-	AVFormatContext *ctx;
+ 
+     if (!dev_name) return;
+     fmt = av_find_input_format(dev_name);
+@@ -2213,42 +2212,31 @@ static void ffavin_enum_devices(const char *dev_name, Bool is_audio)
+     if (!fmt || !fmt->priv_class || !AV_IS_INPUT_DEVICE(fmt->priv_class->category)) {
+ 		return;
+ 	}
+-    ctx = avformat_alloc_context();
+-    if (!ctx) return;
+-    ctx->iformat = (AVInputFormat *)fmt;
+-    if (ctx->iformat->priv_data_size > 0) {
+-        ctx->priv_data = av_mallocz(ctx->iformat->priv_data_size);
+-        if (!ctx->priv_data) {
+-			avformat_free_context(ctx);
+-            return;
+-        }
+-        if (ctx->iformat->priv_class) {
+-            *(const AVClass**)ctx->priv_data = ctx->iformat->priv_class;
+-            av_opt_set_defaults(ctx->priv_data);
+-        }
+-    } else {
+-        ctx->priv_data = NULL;
+-	}
+ 
+ 	AVDeviceInfoList *dev_list = NULL;
+-
+-    AVDictionary *tmp = NULL;
+-	av_dict_set(&tmp, "list_devices", "1", 0);
+-    av_opt_set_dict2(ctx, &tmp, AV_OPT_SEARCH_CHILDREN);
+-	if (tmp)
+-		av_dict_free(&tmp);
+-
+-	int res = avdevice_list_devices(ctx, &dev_list);
++	int res = avdevice_list_input_sources(fmt, dev_name, NULL, &dev_list);
+ 	if (res<0) {
+ 		//device doesn't implement avdevice_list_devices, try loading the context using "list_devices=1" option
+ 		if (-res == ENOSYS) {
++			AVFormatContext *ctx = avformat_alloc_context();
++			if (!ctx) return;
++
+ 			AVDictionary *opts = NULL;
+ 			av_dict_set(&opts, "list_devices", "1", 0);
+ 			res = avformat_open_input(&ctx, "dummy", FF_IFMT_CAST fmt, &opts);
+ 			if (opts)
+ 				av_dict_free(&opts);
++
++#if !defined(__DARWIN__) && !defined(__APPLE__)
++			// FIXME: no-op, permission issues on macOS Sonoma+
++			if (res>=0) avdevice_list_devices(ctx, &dev_list);
++#endif
++
++			if (res>=0) avformat_close_input(&ctx);
++			avformat_free_context(ctx);
+ 		}
+-	} else if (!res && dev_list->nb_devices) {
++	}
++	if (!res && dev_list && dev_list->nb_devices) {
+ 		if (!dev_desc) {
+ 			gf_dynstrcat(&dev_desc, "# Detected devices\n", NULL);
+ 		}
+@@ -2265,7 +2253,6 @@ static void ffavin_enum_devices(const char *dev_name, Bool is_audio)
+ 	}
+ 
+ 	if (dev_list) avdevice_free_list_devices(&dev_list);
+-	avformat_free_context(ctx);
+ }
+ 
+ static void ffavin_log_none(void *avcl, int level, const char *fmt, va_list vl)
diff --git a/multimedia/gpac/gpac.SlackBuild b/multimedia/gpac/gpac.SlackBuild
index 34249ff0be8..43e8390dba9 100644
--- a/multimedia/gpac/gpac.SlackBuild
+++ b/multimedia/gpac/gpac.SlackBuild
@@ -83,6 +83,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/ffmpeg7.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -90,6 +92,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --cpu=$ARCH \
+  --extra-cflags="-fpermissive" \
   --enable-pic
 make
 make install DESTDIR=$PKG
diff --git a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild
index 5fdcb0305ac..3bfe805da84 100644
--- a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild
+++ b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gst-plugins-bad-nonfree
 
-# Copyright 2013-2021  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2013-2024  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -32,7 +32,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gst-plugins-bad-nonfree
-VERSION=${VERSION:-1.18.5}
+VERSION=${VERSION:-1.24.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -206,7 +206,20 @@ cd build
     -Dvulkan=disabled \
     -Dwayland=disabled \
     -Dwebrtc=disabled \
-    -Dwebp=disabled
+    -Dwebp=disabled \
+    -Daes=disabled \
+    -Danalyticsoverlay=disabled \
+    -Dassrender=disabled \
+    -Dcodec2json=disabled \
+    -Dcodecalpha=disabled \
+    -Dcodectimestamper=disabled \
+    -Dinsertbin=disabled \
+    -Dmse=disabled \
+    -Dqroverlay=disabled \
+    -Dqsv=disabled \
+    -Dunixfd=disabled \
+    -Duvcgadget=disabled \
+    -Dzxing=disabled
   "${NINJA:=ninja}"
   DESTDIR=$PKG $NINJA install
 cd ..
diff --git a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info
index 43340d39f2f..bfc39e9e8d8 100644
--- a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info
+++ b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info
@@ -1,8 +1,8 @@
 PRGNAM="gst-plugins-bad-nonfree"
-VERSION="1.18.5"
+VERSION="1.24.0"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
-DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz"
-MD5SUM="4ab1c19c3cf1ba79c20c65f6be78e7fd"
+DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.24.0.tar.xz"
+MD5SUM="22982dd1f7baffa6435551cbe156b888"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
index d5d9e114065..0a2a72d73cd 100644
--- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
+++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gst-plugins-ugly
 
-# Copyright 2013-2021  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2013-2024  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gst-plugins-ugly
-VERSION=${VERSION:-1.18.5}
+VERSION=${VERSION:-1.24.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -90,8 +90,7 @@ cd build
     --localstatedir=/var \
     --mandir=/usr/man \
     --prefix=/usr \
-    --sysconfdir=/etc \
-    -Dexamples=disabled
+    --sysconfdir=/etc
   "${NINJA:=ninja}"
   DESTDIR=$PKG $NINJA install
 cd ..
diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
index 5a55a8aa0f4..50e4d7359e2 100644
--- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
+++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
@@ -1,8 +1,8 @@
 PRGNAM="gst-plugins-ugly"
-VERSION="1.18.5"
+VERSION="1.24.2"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
-DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.5.tar.xz"
-MD5SUM="049f90b7a3a72e241ad47564b5cd7a7a"
+DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.24.2.tar.xz"
+MD5SUM="405e4820eabd142d3cede21360742b7f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/haruna/haruna.SlackBuild b/multimedia/haruna/haruna.SlackBuild
index d4ff0886cda..7212eadc619 100644
--- a/multimedia/haruna/haruna.SlackBuild
+++ b/multimedia/haruna/haruna.SlackBuild
@@ -73,6 +73,8 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+patch -p1 < $CWD/mpv-0.38.patch
+
 mkdir build
 cd build
   cmake \
diff --git a/multimedia/haruna/mpv-0.38.patch b/multimedia/haruna/mpv-0.38.patch
new file mode 100644
index 00000000000..372baa38f14
--- /dev/null
+++ b/multimedia/haruna/mpv-0.38.patch
@@ -0,0 +1,36 @@
+diff -uar haruna-0.12.3.orig/src/mpv/mpvitem.cpp haruna-0.12.3/src/mpv/mpvitem.cpp
+--- haruna-0.12.3.orig/src/mpv/mpvitem.cpp  2023-11-15 20:44:52.000000000 +0200
++++ haruna-0.12.3/src/mpv/mpvitem.cpp   2024-06-02 13:43:21.945207485 +0300
+@@ -116,6 +116,8 @@
+     //    setProperty(QStringLiteral("terminal"), InformationSettings::mpvLogging());
+     //    setProperty(QStringLiteral("msg-level"), QStringLiteral("all=v"));
+ 
++    setProperty(MpvProperties::self()->VO, QStringLiteral("libmpv"));
++
+     QString hwdec = PlaybackSettings::useHWDecoding() ? PlaybackSettings::hWDecoding() : QStringLiteral("no");
+     setProperty(MpvProperties::self()->HardwareDecoding, hwdec);
+     setProperty(MpvProperties::self()->VolumeMax, QStringLiteral("100"));
+diff -uar haruna-0.12.3.orig/src/mpv/mpvpreview.cpp haruna-0.12.3/src/mpv/mpvpreview.cpp
+--- haruna-0.12.3.orig/src/mpv/mpvpreview.cpp   2023-11-15 20:44:52.000000000 +0200
++++ haruna-0.12.3/src/mpv/mpvpreview.cpp    2024-06-02 13:40:21.902051345 +0300
+@@ -11,6 +11,7 @@
+ 
+ MpvPreview::MpvPreview()
+ {
++    setProperty(MpvProperties::self()->VO, QStringLiteral("libmpv"));
+     mpv_observe_property(m_mpv, 0, "time-pos", MPV_FORMAT_DOUBLE);
+ 
+     setProperty(MpvProperties::self()->Mute, true);
+diff -uar haruna-0.12.3.orig/src/mpv/mpvproperties.h haruna-0.12.3/src/mpv/mpvproperties.h
+--- haruna-0.12.3.orig/src/mpv/mpvproperties.h  2023-11-15 20:44:52.000000000 +0200
++++ haruna-0.12.3/src/mpv/mpvproperties.h   2024-06-02 13:43:04.678619289 +0300
+@@ -20,6 +20,9 @@
+         return &p;
+     }
+ 
++    Q_PROPERTY(QString VO MEMBER Pause CONSTANT)
++    const QString VO{QStringLiteral("vo")};
++
+     Q_PROPERTY(QString Pause MEMBER Pause CONSTANT)
+     const QString Pause{QStringLiteral("pause")};
+ 
diff --git a/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild b/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild
index 0d62385bcfc..ace21486336 100644
--- a/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild
+++ b/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=intel-gmmlib
-VERSION=${VERSION:-21.3.1}
+VERSION=${VERSION:-22.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
diff --git a/multimedia/intel-gmmlib/intel-gmmlib.info b/multimedia/intel-gmmlib/intel-gmmlib.info
index 56c6e5218bb..55674bcf8a6 100644
--- a/multimedia/intel-gmmlib/intel-gmmlib.info
+++ b/multimedia/intel-gmmlib/intel-gmmlib.info
@@ -1,8 +1,8 @@
 PRGNAM="intel-gmmlib"
-VERSION="21.3.1"
+VERSION="22.4.1"
 HOMEPAGE="https://github.com/intel/gmmlib/"
-DOWNLOAD="https://github.com/intel/gmmlib/archive/intel-gmmlib-21.3.1/gmmlib-intel-gmmlib-21.3.1.tar.gz"
-MD5SUM="e6755c5d0f44e336f298cee9c7c3fdae"
+DOWNLOAD="https://github.com/intel/gmmlib/archive/intel-gmmlib-22.4.1/gmmlib-intel-gmmlib-22.4.1.tar.gz"
+MD5SUM="37684beaa140a0926967ebd56193cc13"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/intel-media-driver/intel-media-driver.SlackBuild b/multimedia/intel-media-driver/intel-media-driver.SlackBuild
index dfb1b3b30b9..653b7fb6159 100644
--- a/multimedia/intel-media-driver/intel-media-driver.SlackBuild
+++ b/multimedia/intel-media-driver/intel-media-driver.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=intel-media-driver
-VERSION=${VERSION:-21.3.5}
+VERSION=${VERSION:-24.2.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -95,7 +95,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CODEOWNERS LICENSE.md README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.md README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/multimedia/intel-media-driver/intel-media-driver.info b/multimedia/intel-media-driver/intel-media-driver.info
index 9516ea42a46..02a7883f8d8 100644
--- a/multimedia/intel-media-driver/intel-media-driver.info
+++ b/multimedia/intel-media-driver/intel-media-driver.info
@@ -1,10 +1,10 @@
 PRGNAM="intel-media-driver"
-VERSION="21.3.5"
+VERSION="24.2.5"
 HOMEPAGE="https://github.com/intel/media-driver/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/intel/media-driver/archive/intel-media-21.3.5/media-driver-intel-media-21.3.5.tar.gz"
-MD5SUM_x86_64="3ace8aec373b3990acb1e3270e4a9e0b"
+DOWNLOAD_x86_64="https://github.com/intel/media-driver/archive/intel-media-24.2.5/media-driver-intel-media-24.2.5.tar.gz"
+MD5SUM_x86_64="c602d9a3ebebb2ad8a5239dc5951c65b"
 REQUIRES="intel-gmmlib"
 MAINTAINER="Mario Preksavec"
 EMAIL="mario at slackware dot hr"
diff --git a/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild b/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild
index 2c3f1e67bf2..6adf652d143 100644
--- a/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild
+++ b/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=intel-media-sdk
-VERSION=${VERSION:-21.3.5}
+VERSION=${VERSION:-23.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -78,6 +78,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Fix for gcc >= 13.x
+sed -i '/mfxloader/i #include ' api/mfx_dispatch/linux/mfxparser.cpp
+
 mkdir -p build
 cd build
   cmake \
diff --git a/multimedia/intel-media-sdk/intel-media-sdk.info b/multimedia/intel-media-sdk/intel-media-sdk.info
index 8ac23ebd286..8c2d7f82ad6 100644
--- a/multimedia/intel-media-sdk/intel-media-sdk.info
+++ b/multimedia/intel-media-sdk/intel-media-sdk.info
@@ -1,8 +1,8 @@
 PRGNAM="intel-media-sdk"
-VERSION="21.3.5"
+VERSION="23.2.2"
 HOMEPAGE="https://github.com/Intel-Media-SDK/MediaSDK/"
-DOWNLOAD="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-21.3.5/MediaSDK-intel-mediasdk-21.3.5.tar.gz"
-MD5SUM="7a71beb6def13ab71348785a8880dd0a"
+DOWNLOAD="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-23.2.2/MediaSDK-intel-mediasdk-23.2.2.tar.gz"
+MD5SUM="7f348210213fd4a67466b3a20e4b93d7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/kodi/README b/multimedia/kodi/README
index 44352744a8e..9eb635ceb6f 100644
--- a/multimedia/kodi/README
+++ b/multimedia/kodi/README
@@ -28,8 +28,10 @@ directory on your favorite mirror. 3.9.12 and earlier had issues.
 
 FINAL NOTE:
 FFMPEG on 15.0 is too old to be used in kodi v21, so it is using an
-internal version of 6.0.1. If you have FFMPEG v6+ installed (probably
-mainly -current users), you can have kodi build against the system
+internal version of 6.1.2. If you have FFMPEG v6+ installed (probably
+mainly -current users), you could have kodi build against the system
 version by passing FFMPEG=external when building. System versions of
 FFMPEG may need to be recompiled to enable certain functionality like
 AV1 after installing dav1d.
+Note that ATM ffmpeg 7.x in current is unsupported so you have to
+rely on the internal version.
diff --git a/multimedia/kodi/kodi.SlackBuild b/multimedia/kodi/kodi.SlackBuild
index 32e44e3afae..78eefaafc87 100644
--- a/multimedia/kodi/kodi.SlackBuild
+++ b/multimedia/kodi/kodi.SlackBuild
@@ -41,7 +41,7 @@ libdvdreadVER=${libdvdreadVER:-6.1.3-Next-Nexus-Alpha2-2}
 groovyVER=${groovyVER:-4.0.16}
 comLangVER=${comLangVER:-3.14.0}
 comTextVER=${comTextVER:-1.11.0}
-ffmpegVER=${ffmpegVER:-6.0.1}
+ffmpegVER=${ffmpegVER:-6.1.2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -85,6 +85,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 {} \;
 
+# swig 4.3.0 removed this command line option
+# https://github.com/swig/swig/commit/86498e4
+sed -i 's|-xmllang python ||' xbmc/interfaces/swig/CMakeLists.txt
+
+# Update the internal ffmpeg to build on current
+echo 'LIBNAME=ffmpeg' > tools/depends/target/ffmpeg/FFMPEG-VERSION
+echo 'VERSION=6.1.2' >> tools/depends/target/ffmpeg/FFMPEG-VERSION
+echo 'ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz' >> tools/depends/target/ffmpeg/FFMPEG-VERSION
+echo 'SHA512=3a009184d971fc3168e1322d1d724aae787ed0e9c152d8d1813ea0b9099bda3b35c41fcabbd7b140560e7a8fa9fa1ffd7f0938432d5d498c43829fc6cc3d9e08' >> tools/depends/target/ffmpeg/FFMPEG-VERSION
+
 # Autodetection of "optional" dependencies sucks. It does not work and
 # compilation will fail on each of these if not explicitly disabled.
 # Figured I'd implement my own autodetection instead of requiring
@@ -115,7 +125,7 @@ if [ "${FFMPEG}" == "external" ]; then
   FFMPEGURL=""
 else
   FFMPEG="ON"
-  FFMPEGURL="-DFFMPEG_URL=$CWD/ffmpeg-$ffmpegVER.tar.gz"
+  FFMPEGURL="-DFFMPEG_URL=$CWD/ffmpeg-$ffmpegVER.tar.xz"
 fi
 
 # There doesn't seem to be a way to specify the url of these files
diff --git a/multimedia/kodi/kodi.info b/multimedia/kodi/kodi.info
index 5270c23a070..065ee521dd1 100644
--- a/multimedia/kodi/kodi.info
+++ b/multimedia/kodi/kodi.info
@@ -9,7 +9,7 @@ DOWNLOAD="https://github.com/xbmc/xbmc/archive/21.1-Omega/xbmc-21.1-Omega.tar.gz
           http://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip \
           http://mirrors.kodi.tv/build-deps/sources/commons-lang3-3.14.0-bin.tar.gz \
           http://mirrors.kodi.tv/build-deps/sources/commons-text-1.11.0-bin.tar.gz \
-          http://mirrors.kodi.tv/build-deps/sources/ffmpeg-6.0.1.tar.gz"
+          https://ffmpeg.org//releases/ffmpeg-6.1.2.tar.xz"
 MD5SUM="c6c6411354639e8fdd30ca06a102cba3 \
         d4a8d62f3f8d6d946be75cf5bfa92687 \
         42dc3770ae928103e8033a18b007e79d \
@@ -18,7 +18,7 @@ MD5SUM="c6c6411354639e8fdd30ca06a102cba3 \
         bd9eb761a11372dd659da8c2cf1ae692 \
         88c83b3fa007ae35d4f82a2466cad423 \
         ae1f7607159b192e12f9c8eaaaf3d927 \
-        ab9c27629c2a43689c63ff55fd7cbf67"
+        42f9bb3aacdd5c5907d1af1811738c00"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="zulu-openjdk11 libass flatbuffers tinyxml gtest fstrcmp spdlog tinyxml2 libdisplay-info rapidjson"
diff --git a/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild b/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild
index 933ffc8bda3..1a67c7eefbe 100644
--- a/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild
+++ b/multimedia/mkvtoolnix/mkvtoolnix.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mkvtoolnix
-VERSION=${VERSION:-80.0}
+VERSION=${VERSION:-88.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
diff --git a/multimedia/mkvtoolnix/mkvtoolnix.info b/multimedia/mkvtoolnix/mkvtoolnix.info
index 4365df658fb..196ce75c21c 100644
--- a/multimedia/mkvtoolnix/mkvtoolnix.info
+++ b/multimedia/mkvtoolnix/mkvtoolnix.info
@@ -1,8 +1,8 @@
 PRGNAM="mkvtoolnix"
-VERSION="80.0"
+VERSION="88.0"
 HOMEPAGE="https://mkvtoolnix.download/"
-DOWNLOAD="https://mkvtoolnix.download/sources/mkvtoolnix-80.0.tar.xz"
-MD5SUM="464b82fc3903d96298e4dadaae53200f"
+DOWNLOAD="https://mkvtoolnix.download/sources/mkvtoolnix-88.0.tar.xz"
+MD5SUM="b7c06326998d18553681c9565a9f2931"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cmark"
diff --git a/multimedia/mpv/README b/multimedia/mpv/README
deleted file mode 100644
index 56ded2b4c97..00000000000
--- a/multimedia/mpv/README
+++ /dev/null
@@ -1,39 +0,0 @@
-mpv is a movie player based on MPlayer and mplayer2. It shares some
-features with the former projects while introducing many more. It
-supports a wide variety of video file formats, audio and video codecs,
-and subtitle types.
-
-This SlackBuild provides support for most useful optional features.
-Some other optional features may be enabled by having the relevant
-packages installed; they will be autodetected at build time.
-These include:
-  jack, libuchardet, oss, rubberband, cudatoolkit, nv-codec-headers
-
-Please note that CUDA based hardware acceleration requires mpv to be
-built with both the cudatoolkit and nv-codec-headers packages installed.
-
-Since Pipewire is not configured as the default in Slackware,
-its use is disabled in this SlackBuild. To enable Pipewire, run the
-SlackBuild with the USE_PIPEWIRE environment variable set e.g.
-  USE_PIPEWIRE=yes sh mpv.SlackBuild
-
-Most dependencies are autodetected. Some optional dependencies are
-disabled by default and may be enabled via the BUILD_OPTS environment
-variable. Optional dependencies that are enabled by default may be
-disabled in the same way.
-
-For example, to enable support for OpenAL and SDL2 (both disabled
-by default) as well as to disable javascript support (normally
-autodetected), you could run:
-
-BUILD_OPTS="-Dopenal=enabled -Dsdl2=enabled -Djavascript=disabled" \
-  sh mpv.SlackBuild
-
-Runtime support for youtube videos requires installation of youtube-dl
-(available from SBo) to be installed. Watch with something like:
-  mpv https://www.youtube.com/watch?v=mAFMJ1LnQu8
-
-To enable building with meson/ninja (recommended since waf build is
-to be deprecated), a patch is required to enable use of Slackware 15's
-older version of meson. Unfortunately this disables the ability to
-process configuration/building on Raspberry Pi.
diff --git a/multimedia/mpv/doinst.sh b/multimedia/mpv/doinst.sh
deleted file mode 100644
index 5ce5efbf409..00000000000
--- a/multimedia/mpv/doinst.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-for f in etc/mpv/*.conf.new ; do
-  preserve_perms $f
-done
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
diff --git a/multimedia/mpv/mpv.SlackBuild b/multimedia/mpv/mpv.SlackBuild
deleted file mode 100644
index b80143249e7..00000000000
--- a/multimedia/mpv/mpv.SlackBuild
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for mpv
-
-# Copyright 2015 John Vogel Corning, NY USA
-# Copyright 2017,2018 (versions 0.25.0-0.29.1) Andreas Guldstrand
-# Copyright 2020-2024 Christoph Willing  Sydney Australia
-# 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.
-
-# 20241009 bkw: Modified by SlackBuilds.org, BUILD=2:
-# - Bump BUILD for luajit-2.1.x
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=mpv
-VERSION=${VERSION:-0.38.0}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-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 {} \;
-
-DOCS="Copyright LICENSE.GPL LICENSE.LGPL README.md RELEASE_NOTES VERSION"
-MANUAL="DOCS/*.md DOCS/*.rst DOCS/*.txt"
-
-pipewire="-Dpipewire=disabled" ; [ "${USE_PIPEWIRE:-no}" != "no" ] && pipewire="-Dpipewire=auto"
-
-# This leaves an opening for additional build options.
-# See `meson configure` to see what's available.
-BUILD_OPTS=${BUILD_OPTS:-""}
-
-PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
-export PYTHONPATH=/opt/python$PYVER/site-packages/
-
-CFLAGS="$SLKCFLAGS -ldl" \
-CXXFLAGS="$SLKCFLAGS" \
-meson \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --mandir=/usr/man \
-  -Dbuildtype=release \
-  -Dmanpage-build=enabled \
-  -Dlibmpv=true \
-  -Dhtml-build=enabled \
-  -Dcdda=enabled \
-  -Ddvdnav=enabled \
-  -Ddvbin=enabled \
-  $pipewire \
-  $BUILD_OPTS \
-  . build
-
-DESTDIR=$PKG ${NINJA:=ninja} -C build -v install
-
-for f in $PKG/etc/mpv/*.conf ; do
-  mv $f{,.new}
-done
-
-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
-
-if [ -d $PKG/usr/man ]; then
-  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
-fi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/manual
-for f in $MANUAL; do
-  cp -a $f $PKG/usr/doc/$PRGNAM-$VERSION/manual/
-done
-cp -a $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/doc
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/multimedia/mpv/mpv.info b/multimedia/mpv/mpv.info
deleted file mode 100644
index ba4f43fa4ad..00000000000
--- a/multimedia/mpv/mpv.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="mpv"
-VERSION="0.38.0"
-HOMEPAGE="https://mpv.io/"
-DOWNLOAD="https://github.com/mpv-player/mpv/archive/v0.38.0/mpv-0.38.0.tar.gz"
-MD5SUM="7c1a400867e8930f037efc86c1f90a14"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libass libplacebo luajit mujs"
-MAINTAINER="Christoph Willing"
-EMAIL="chris.willing@linux.com"
diff --git a/multimedia/mpv/slack-desc b/multimedia/mpv/slack-desc
deleted file mode 100644
index 1dd99eff196..00000000000
--- a/multimedia/mpv/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------------------------------------------------------|
-mpv: mpv (a movie player based on MPlayer and mplayer2)
-mpv:
-mpv: mpv is a fork of mplayer2 and MPlayer. It shares some features with
-mpv: the former projects while introducing many more. It supports a wide
-mpv: variety of video file formats, audio and video codecs, and subtitle
-mpv: types.
-mpv:
-mpv:
-mpv:
-mpv: mpv homepage: http://mpv.io/
-mpv:
diff --git a/multimedia/obs-studio/obs-studio.SlackBuild b/multimedia/obs-studio/obs-studio.SlackBuild
index 70173017186..a2eae7c64ee 100644
--- a/multimedia/obs-studio/obs-studio.SlackBuild
+++ b/multimedia/obs-studio/obs-studio.SlackBuild
@@ -103,6 +103,10 @@ 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 {} \;
 
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
+sed -i '/include "browser-app.hpp"/i #include ' plugins/obs-browser/browser-app.cpp
+sed -e 's|-Werror-implicit-function-declaration||g' -i cmake/Modules/CompilerConfig.cmake
+sed -e '/-Werror/d' -i cmake/Modules/CompilerConfig.cmake
 
 mkdir -p build
 cd build
diff --git a/multimedia/obs-studio/patches/1_7ed9b1f.patch b/multimedia/obs-studio/patches/1_7ed9b1f.patch
new file mode 100644
index 00000000000..438004ea39d
--- /dev/null
+++ b/multimedia/obs-studio/patches/1_7ed9b1f.patch
@@ -0,0 +1,43 @@
+From 7ed9b1f3a6b5e73a39daf906c8e8c19e93fce4b4 Mon Sep 17 00:00:00 2001
+From: Stephen Seo 
+Date: Wed, 29 Nov 2023 22:06:09 +0900
+Subject: [PATCH] deps/media-playback: Use new (nb_)coded_side_data FFmpeg 6.1
+ API
+
+Fixes for using FFmpeg 6.1 due to deprecations. Uses `#if` macros to
+allow builds for using older versions of FFmpeg.
+
+The change in deps/media-playback/media-playback/decode.c is due to
+FFmpeg moving "side_data" into AVCodecParameters which is mentioned in
+commit [1] in FFmpeg's repository.
+
+In summary of the "side_data" change, AVStream.side_data is deprecated
+and replaced with AVStream.codecpar->coded_side_data, and
+AVStream.nb_side_data is replaced with
+AVStream.codecpar->nb_coded_side_data.
+
+[1]: avcodec/codec_par: add side data to AVCodecParameters
+https://github.com/FFmpeg/FFmpeg/commit/21d7cc6fa9a26e94965fa71b25655d07568450fe
+---
+ deps/media-playback/media-playback/decode.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/deps/media-playback/media-playback/decode.c b/deps/media-playback/media-playback/decode.c
+index 55b91c140ace4..40853f171bde7 100644
+--- a/deps/media-playback/media-playback/decode.c
++++ b/deps/media-playback/media-playback/decode.c
+@@ -114,8 +114,14 @@ static uint16_t get_max_luminance(const AVStream *stream)
+ {
+ 	uint32_t max_luminance = 0;
+ 
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
+ 	for (int i = 0; i < stream->nb_side_data; i++) {
+ 		const AVPacketSideData *const sd = &stream->side_data[i];
++#else
++	for (int i = 0; i < stream->codecpar->nb_coded_side_data; i++) {
++		const AVPacketSideData *const sd =
++			&stream->codecpar->coded_side_data[i];
++#endif
+ 		switch (sd->type) {
+ 		case AV_PKT_DATA_MASTERING_DISPLAY_METADATA: {
+ 			const AVMasteringDisplayMetadata *mastering =
diff --git a/multimedia/obs-studio/patches/2_92fc9f6.patch b/multimedia/obs-studio/patches/2_92fc9f6.patch
new file mode 100644
index 00000000000..db0221d0a96
--- /dev/null
+++ b/multimedia/obs-studio/patches/2_92fc9f6.patch
@@ -0,0 +1,43 @@
+From 92fc9f69ccff2cb12bb8ef877e9238f5d46588a8 Mon Sep 17 00:00:00 2001
+From: Stephen Seo 
+Date: Wed, 29 Nov 2023 22:08:42 +0900
+Subject: [PATCH] deps/media-playback: In check for key-frame, use new FFmpeg
+ 6.1 API
+
+Fixes for using FFmpeg 6.1 due to deprecations. Uses `#if` macros to
+allow builds for using older versions of FFmpeg.
+
+AVFrame.key_frame was replaced with a flag in AVFrame.flags. The commit
+adding the flag is [1] in FFmpeg's repository, and the deprecation is in
+commit [2].
+
+In summary of the "key_frame" change, AVFrame.key_frame is deprecated,
+and AVFrame.flags indicates with a bit flag if it is a key frame (with
+the enum/defined AV_FRAME_FLAG_KEY).
+
+[1]: avutil/frame: add a keyframe flag to AVFrame
+https://github.com/FFmpeg/FFmpeg/commit/cc11191fda0471017b03c1434d6d8cb79f6914e5
+
+[2]: avutil/frame: deprecate key_frame
+https://github.com/FFmpeg/FFmpeg/commit/3e06f6f04020bef32fa42bc9d7f96e76a46453aa
+---
+ deps/media-playback/media-playback/media.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/deps/media-playback/media-playback/media.c b/deps/media-playback/media-playback/media.c
+index 566eb9e35c9ef..07b040dd8235c 100644
+--- a/deps/media-playback/media-playback/media.c
++++ b/deps/media-playback/media-playback/media.c
+@@ -504,7 +504,12 @@ void mp_media_next_video(mp_media_t *m, bool preload)
+ 	}
+ 
+ 	if (!m->is_local_file && !d->got_first_keyframe) {
++
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(58, 29, 100)
+ 		if (!f->key_frame)
++#else
++		if (!(f->flags & AV_FRAME_FLAG_KEY))
++#endif
+ 			return;
+ 
+ 		d->got_first_keyframe = true;
diff --git a/multimedia/obs-studio/patches/3_ed1e079.patch b/multimedia/obs-studio/patches/3_ed1e079.patch
new file mode 100644
index 00000000000..d1e435ca9dc
--- /dev/null
+++ b/multimedia/obs-studio/patches/3_ed1e079.patch
@@ -0,0 +1,39 @@
+From ed1e0795acde8349ab18b631c545f56e5a3acb9d Mon Sep 17 00:00:00 2001
+From: Stephen Seo 
+Date: Wed, 29 Nov 2023 20:07:10 +0900
+Subject: [PATCH] libobs: Fence off unnecessary code due to FFmpeg v6.1 changes
+
+Fixes for using FFmpeg 6.1 due to deprecations. Uses `#if` macros to
+allow builds for using older versions of FFmpeg.
+
+This commit prevents obs from using the "fenced" code if using FFmpeg
+6.1, since in FFmpeg commit [1] the "side_data" is added to
+`AVCodecParameters`, and therefore the existing/following
+`avcodec_parameters_copy(...)` will account for the metadata.
+
+[1]: avcodec/codec_par: add side data to AVCodecParameters
+https://github.com/FFmpeg/FFmpeg/commit/21d7cc6fa9a26e94965fa71b25655d07568450fe
+---
+ libobs/media-io/media-remux.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libobs/media-io/media-remux.c b/libobs/media-io/media-remux.c
+index 7d5eead200012..827d4e59b18ed 100644
+--- a/libobs/media-io/media-remux.c
++++ b/libobs/media-io/media-remux.c
+@@ -91,6 +91,7 @@ static inline bool init_output(media_remux_job_t job, const char *out_filename)
+ 			return false;
+ 		}
+ 
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
+ #if FF_API_BUFFER_SIZE_T
+ 		int content_size;
+ #else
+@@ -125,6 +126,7 @@ static inline bool init_output(media_remux_job_t job, const char *out_filename)
+ 				       mastering_size);
+ 			}
+ 		}
++#endif
+ 
+ 		ret = avcodec_parameters_copy(out_stream->codecpar,
+ 					      in_stream->codecpar);
diff --git a/multimedia/obs-studio/patches/4_6d0381f.patch b/multimedia/obs-studio/patches/4_6d0381f.patch
new file mode 100644
index 00000000000..a386f53a3b5
--- /dev/null
+++ b/multimedia/obs-studio/patches/4_6d0381f.patch
@@ -0,0 +1,157 @@
+From 6d0381f98ce0a5624901b0042d624ea972a10c2b Mon Sep 17 00:00:00 2001
+From: Stephen Seo 
+Date: Wed, 29 Nov 2023 20:09:08 +0900
+Subject: [PATCH] obs-ffmpeg: Use new side-data FFmpeg 6.1 API
+
+Fixes for using FFmpeg 6.1 due to deprecations. Uses `#if` macros to
+allow builds for using older versions of FFmpeg.
+
+This commit replaces usage of `av_stream_add_side_data(...)` with
+`av_packet_side_data_add(...)`, as the former was deprecated in favor of
+the latter.
+
+The FFmpeg commit that deprecated `av_stream_add_side_data(...)` is [1].
+
+The FFmpeg commit that introduced `av_packet_side_data_add(...)` is [2].
+
+Note that the deprecation commit is after the new API function. The
+commit in between [3] appears to be changes that migrates to the usage
+of the new API function.
+
+[1]: avformat/avformat: use the side data from AVStream.codecpar
+https://github.com/FFmpeg/FFmpeg/commit/5432d2aacad5fa7420fe2d9369ed061d521e92d6
+
+[2]: avcodec/packet: add generic side data helpers
+https://github.com/FFmpeg/FFmpeg/commit/74279227dd28d01b447edb8e617a545982171c2c
+
+[3]: avcodec/codec_par: add side data to AVCodecParameters
+https://github.com/FFmpeg/FFmpeg/commit/21d7cc6fa9a26e94965fa71b25655d07568450fe
+---
+ plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c | 16 ++++++++++++++++
+ plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c     | 16 ++++++++++++++++
+ plugins/obs-ffmpeg/obs-ffmpeg-output.c     | 16 ++++++++++++++++
+ 3 files changed, 48 insertions(+)
+
+diff --git a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
+index 740b60e5bf46e..8fb84aa7c4e0b 100644
+--- a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
++++ b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
+@@ -498,9 +498,17 @@ static void create_video_stream(struct ffmpeg_mux *ffm)
+ 			av_content_light_metadata_alloc(&content_size);
+ 		content->MaxCLL = max_luminance;
+ 		content->MaxFALL = max_luminance;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
+ 		av_stream_add_side_data(ffm->video_stream,
+ 					AV_PKT_DATA_CONTENT_LIGHT_LEVEL,
+ 					(uint8_t *)content, content_size);
++#else
++		av_packet_side_data_add(
++			&ffm->video_stream->codecpar->coded_side_data,
++			&ffm->video_stream->codecpar->nb_coded_side_data,
++			AV_PKT_DATA_CONTENT_LIGHT_LEVEL, (uint8_t *)content,
++			content_size, 0);
++#endif
+ 
+ 		AVMasteringDisplayMetadata *const mastering =
+ 			av_mastering_display_metadata_alloc();
+@@ -516,10 +524,18 @@ static void create_video_stream(struct ffmpeg_mux *ffm)
+ 		mastering->max_luminance = av_make_q(max_luminance, 1);
+ 		mastering->has_primaries = 1;
+ 		mastering->has_luminance = 1;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
+ 		av_stream_add_side_data(ffm->video_stream,
+ 					AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
+ 					(uint8_t *)mastering,
+ 					sizeof(*mastering));
++#else
++		av_packet_side_data_add(
++			&ffm->video_stream->codecpar->coded_side_data,
++			&ffm->video_stream->codecpar->nb_coded_side_data,
++			AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
++			(uint8_t *)mastering, sizeof(*mastering), 0);
++#endif
+ 	}
+ 
+ 	if (ffm->output->oformat->flags & AVFMT_GLOBALHEADER)
+diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c b/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c
+index f33ee77365274..a56dd91bcc38e 100644
+--- a/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c
++++ b/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c
+@@ -168,9 +168,17 @@ static bool create_video_stream(struct ffmpeg_output *stream,
+ 			av_content_light_metadata_alloc(&content_size);
+ 		content->MaxCLL = hdr_nominal_peak_level;
+ 		content->MaxFALL = hdr_nominal_peak_level;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
+ 		av_stream_add_side_data(data->video,
+ 					AV_PKT_DATA_CONTENT_LIGHT_LEVEL,
+ 					(uint8_t *)content, content_size);
++#else
++		av_packet_side_data_add(
++			&data->video->codecpar->coded_side_data,
++			&data->video->codecpar->nb_coded_side_data,
++			AV_PKT_DATA_CONTENT_LIGHT_LEVEL, (uint8_t *)content,
++			content_size, 0);
++#endif
+ 
+ 		AVMasteringDisplayMetadata *const mastering =
+ 			av_mastering_display_metadata_alloc();
+@@ -186,10 +194,18 @@ static bool create_video_stream(struct ffmpeg_output *stream,
+ 		mastering->max_luminance = av_make_q(hdr_nominal_peak_level, 1);
+ 		mastering->has_primaries = 1;
+ 		mastering->has_luminance = 1;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
+ 		av_stream_add_side_data(data->video,
+ 					AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
+ 					(uint8_t *)mastering,
+ 					sizeof(*mastering));
++#else
++		av_packet_side_data_add(
++			&data->video->codecpar->coded_side_data,
++			&data->video->codecpar->nb_coded_side_data,
++			AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
++			(uint8_t *)mastering, sizeof(*mastering), 0);
++#endif
+ 	}
+ 	context = avcodec_alloc_context3(NULL);
+ 	context->codec_type = codec->type;
+diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-output.c b/plugins/obs-ffmpeg/obs-ffmpeg-output.c
+index ec02b59cda9d8..c7786153392e5 100644
+--- a/plugins/obs-ffmpeg/obs-ffmpeg-output.c
++++ b/plugins/obs-ffmpeg/obs-ffmpeg-output.c
+@@ -213,9 +213,17 @@ static bool create_video_stream(struct ffmpeg_data *data)
+ 			av_content_light_metadata_alloc(&content_size);
+ 		content->MaxCLL = hdr_nominal_peak_level;
+ 		content->MaxFALL = hdr_nominal_peak_level;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
+ 		av_stream_add_side_data(data->video,
+ 					AV_PKT_DATA_CONTENT_LIGHT_LEVEL,
+ 					(uint8_t *)content, content_size);
++#else
++		av_packet_side_data_add(
++			&data->video->codecpar->coded_side_data,
++			&data->video->codecpar->nb_coded_side_data,
++			AV_PKT_DATA_CONTENT_LIGHT_LEVEL, (uint8_t *)content,
++			content_size, 0);
++#endif
+ 
+ 		AVMasteringDisplayMetadata *const mastering =
+ 			av_mastering_display_metadata_alloc();
+@@ -231,10 +239,18 @@ static bool create_video_stream(struct ffmpeg_data *data)
+ 		mastering->max_luminance = av_make_q(hdr_nominal_peak_level, 1);
+ 		mastering->has_primaries = 1;
+ 		mastering->has_luminance = 1;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
+ 		av_stream_add_side_data(data->video,
+ 					AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
+ 					(uint8_t *)mastering,
+ 					sizeof(*mastering));
++#else
++		av_packet_side_data_add(
++			&data->video->codecpar->coded_side_data,
++			&data->video->codecpar->nb_coded_side_data,
++			AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
++			(uint8_t *)mastering, sizeof(*mastering), 0);
++#endif
+ 	}
+ 
+ 	closest_format = data->config.format;
diff --git a/multimedia/obs-studio/patches/5_ffmpeg-7.patch b/multimedia/obs-studio/patches/5_ffmpeg-7.patch
new file mode 100644
index 00000000000..dad98312e9e
--- /dev/null
+++ b/multimedia/obs-studio/patches/5_ffmpeg-7.patch
@@ -0,0 +1,64 @@
+From 8dbad9ac2974f9db776838e3f87c57c15291e983 Mon Sep 17 00:00:00 2001
+From: tytan652 
+Date: Sat, 6 Apr 2024 08:50:07 +0200
+Subject: [PATCH] obs-ffmpeg: Fix incompatible-pointer-types with FFmpeg 7
+
+---
+ plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c |  5 +++++
+ plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c     | 18 ++++++++++++------
+ 2 files changed, 17 insertions(+), 6 deletions(-)
+
+diff --git a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
+index a05c33c942477c..b4e9203bf99828 100644
+--- a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
++++ b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
+@@ -886,7 +886,12 @@ static int64_t ffmpeg_mux_seek_av_buffer(void *opaque, int64_t offset,
+ 	return 0;
+ }
+ 
++#if LIBAVFORMAT_VERSION_MAJOR >= 61
++static int ffmpeg_mux_write_av_buffer(void *opaque, const uint8_t *buf,
++				      int buf_size)
++#else
+ static int ffmpeg_mux_write_av_buffer(void *opaque, uint8_t *buf, int buf_size)
++#endif
+ {
+ 	struct ffmpeg_mux *ffm = opaque;
+ 
+diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c b/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c
+index f23bf25c0ec2bc..69ec8a7c25ef4a 100644
+--- a/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c
++++ b/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c
+@@ -421,6 +421,12 @@ static inline int connect_mpegts_url(struct ffmpeg_output *stream, bool is_rist)
+ 	return err;
+ }
+ 
++#if LIBAVFORMAT_VERSION_MAJOR >= 61
++typedef int (*write_packet_cb)(void *, const uint8_t *, int);
++#else
++typedef int (*write_packet_cb)(void *, uint8_t *, int);
++#endif
++
+ static inline int allocate_custom_aviocontext(struct ffmpeg_output *stream,
+ 					      bool is_rist)
+ {
+@@ -437,13 +443,13 @@ static inline int allocate_custom_aviocontext(struct ffmpeg_output *stream,
+ 		return AVERROR(ENOMEM);
+ 	/* allocate custom avio_context */
+ 	if (is_rist)
+-		s = avio_alloc_context(
+-			buffer, buffer_size, AVIO_FLAG_WRITE, h, NULL,
+-			(int (*)(void *, uint8_t *, int))librist_write, NULL);
++		s = avio_alloc_context(buffer, buffer_size, AVIO_FLAG_WRITE, h,
++				       NULL, (write_packet_cb)librist_write,
++				       NULL);
+ 	else
+-		s = avio_alloc_context(
+-			buffer, buffer_size, AVIO_FLAG_WRITE, h, NULL,
+-			(int (*)(void *, uint8_t *, int))libsrt_write, NULL);
++		s = avio_alloc_context(buffer, buffer_size, AVIO_FLAG_WRITE, h,
++				       NULL, (write_packet_cb)libsrt_write,
++				       NULL);
+ 	if (!s)
+ 		goto fail;
+ 	s->max_packet_size = h->max_packet_size;
diff --git a/multimedia/openshot/openshot.info b/multimedia/openshot/openshot.info
index f9ff5f78318..ff27fa6318e 100644
--- a/multimedia/openshot/openshot.info
+++ b/multimedia/openshot/openshot.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/OpenShot/openshot-qt/archive/v3.2.1/openshot-qt-3.2
 MD5SUM="081b1aedfbb1e0a9812653f4c7586d67"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3-pyzmq libopenshot python3-httplib2 jack"
+REQUIRES="python3-PyQtWebEngine python3-pyzmq libopenshot python3-httplib2 jack"
 MAINTAINER="Christoph Willing"
 EMAIL="chris.willing@linux.com"
diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg-0.10.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg-0.10.patch
deleted file mode 100644
index ea737c8b098..00000000000
--- a/multimedia/transcode/transcode-1.1.7-ffmpeg-0.10.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/401287
-
---- filter/filter_pp.c
-+++ filter/filter_pp.c
-@@ -38,8 +38,8 @@
- 
- /* FIXME: these use the filter ID as an index--the ID can grow
-  * arbitrarily large, so this needs to be fixed */
--static pp_mode_t *mode[100];
--static pp_context_t *context[100];
-+static pp_mode *mode[100];
-+static pp_context *context[100];
- static int width[100], height[100];
- static int pre[100];
- 
diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg-0.11.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg-0.11.patch
deleted file mode 100644
index 871d073fead..00000000000
--- a/multimedia/transcode/transcode-1.1.7-ffmpeg-0.11.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-Fix build with ffmpeg 0.11.
-https://bugs.gentoo.org/show_bug.cgi?id=419551
-Author: Brennan Shacklett
-
-diff -urN transcode-1.1.7-orig/encode/encode_lavc.c transcode-1.1.7/encode/encode_lavc.c
---- transcode-1.1.7-orig/encode/encode_lavc.c	2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/encode/encode_lavc.c	2012-07-03 10:47:03.528009149 -0700
-@@ -114,6 +114,7 @@
- 
-     AVFrame ff_venc_frame;
-     AVCodecContext ff_vcontext;
-+    AVDictionary ** ff_opts;
- 
-     AVCodec *ff_vcodec;
- 
-@@ -1036,14 +1037,10 @@
-     SET_FLAG(pd, mv0);
-     SET_FLAG(pd, cbp);
-     SET_FLAG(pd, qpel);
--    SET_FLAG(pd, alt);
--    SET_FLAG(pd, vdpart);
-     SET_FLAG(pd, naq);
-     SET_FLAG(pd, ilme);
-     SET_FLAG(pd, ildct);
-     SET_FLAG(pd, aic);
--    SET_FLAG(pd, aiv);
--    SET_FLAG(pd, umv);
-     SET_FLAG(pd, psnr);
-     SET_FLAG(pd, trell);
-     SET_FLAG(pd, gray);
-@@ -1064,6 +1061,18 @@
-         pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
-         pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
-     }
-+    if (pd->confdata.flags.alt) {
-+        av_dict_set(pd->ff_opts, "alternate_scan", "1", 0);
-+    }
-+    if (pd->confdata.flags.vdpart) {
-+        av_dict_set(pd->ff_opts, "data_partitioning", "1", 0);
-+    }
-+    if (pd->confdata.flags.umv) {
-+        av_dict_set(pd->ff_opts, "umv", "1", 0);
-+    }
-+    if (pd->confdata.flags.aiv) {
-+        av_dict_set(pd->ff_opts, "aiv", "1", 0);
-+    }
- }
- 
- #undef SET_FLAG
-@@ -1184,18 +1193,18 @@
-         { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
-         { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
-         { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
--        { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN },
-+        { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
-         { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
-         { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT },
-         { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP },
--        { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART },
-+        { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-         { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC },
- #else        
-         { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED },
- #endif
--        { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV },
--        { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV },
-+        { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 },
-+        { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 },
-         { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR },
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-         { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT },
-@@ -1387,7 +1396,7 @@
-                     pd->confdata.thread_count,
-                     (pd->confdata.thread_count > 1) ?"s" :"");
-     }
--    avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count);
-+    pd->ff_vcontext.thread_count = pd->confdata.thread_count;
- 
-     pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd));
-     if (pd->ff_vcodec == NULL) {
-@@ -1397,11 +1406,11 @@
-     }
- 
-     TC_LOCK_LIBAVCODEC;
--    ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec);
-+    ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts);
-     TC_UNLOCK_LIBAVCODEC;
- 
-     if (ret < 0) {
--        tc_log_error(MOD_NAME, "avcodec_open() failed");
-+        tc_log_error(MOD_NAME, "avcodec_open2() failed");
-         goto failed;
-     }
-     /* finally, pass up the extradata, if any */
-diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c
---- transcode-1.1.7-orig/export/export_ffmpeg.c	2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/export/export_ffmpeg.c	2012-07-03 13:15:23.918019415 -0700
-@@ -122,6 +122,7 @@
- static AVFrame             *lavc_convert_frame = NULL;
- 
- static AVCodec             *lavc_venc_codec = NULL;
-+static AVDictionary        **lavc_venc_opts = NULL;
- static AVFrame             *lavc_venc_frame = NULL;
- static AVCodecContext      *lavc_venc_context;
- static avi_t               *avifile = NULL;
-@@ -180,7 +181,7 @@
- 
- 
- /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */
--#include 
-+#include 
- #include 
- #include 
- 
-@@ -470,7 +471,6 @@
-     }
- 
-     TC_LOCK_LIBAVCODEC;
--    avcodec_init();
-     avcodec_register_all();
-     TC_UNLOCK_LIBAVCODEC;
- 
-@@ -634,7 +634,7 @@
-         lavc_param_rc_max_rate = 2516;
-         lavc_param_rc_buffer_size = 224 * 8;
-         lavc_param_rc_buffer_aggressivity = 99;
--        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
-+        lavc_param_scan_offset = 1;
- 
-         break;
- 
-@@ -674,7 +674,7 @@
- 
-         lavc_param_rc_buffer_size = 224 * 8;
-         lavc_param_rc_buffer_aggressivity = 99;
--        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
-+        lavc_param_scan_offset = 1;
- 
-         break;
- 
-@@ -887,7 +887,7 @@
- 		    lavc_venc_context->thread_count);
-     }
- 
--    avcodec_thread_init(lavc_venc_context, lavc_param_threads);
-+    lavc_venc_context->thread_count = lavc_param_threads;
- 
-     if (lavc_param_intra_matrix) {
-         char *tmp;
-@@ -1065,15 +1065,10 @@
-     lavc_venc_context->flags |= lavc_param_closedgop;
-     lavc_venc_context->flags |= lavc_param_trunc;
-     lavc_venc_context->flags |= lavc_param_aic;
--    lavc_venc_context->flags |= lavc_param_umv;
-     lavc_venc_context->flags |= lavc_param_v4mv;
--    lavc_venc_context->flags |= lavc_param_data_partitioning;
-     lavc_venc_context->flags |= lavc_param_cbp;
-     lavc_venc_context->flags |= lavc_param_mv0;
-     lavc_venc_context->flags |= lavc_param_qp_rd;
--    lavc_venc_context->flags |= lavc_param_scan_offset;
--    lavc_venc_context->flags |= lavc_param_ss;
--    lavc_venc_context->flags |= lavc_param_alt;
-     lavc_venc_context->flags |= lavc_param_ilme;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
-     lavc_venc_context->flags |= lavc_param_trell;
-@@ -1203,7 +1198,6 @@
- 
-     lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
- 
--
- 	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
- 	if (lavc_param_video_preset) {
- 		avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
-@@ -1241,20 +1235,39 @@
- 		}
- 	}
- 
-+    if (lavc_param_scan_offset) {
-+      av_dict_set(lavc_venc_opts, "scan_offset", "1", 0);
-+    }
-+
-+    if (lavc_param_ss) {
-+      av_dict_set(lavc_venc_opts, "structured_slices", "1", 0);
-+    }
-+
-+    if (lavc_param_alt) {
-+      av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0);
-+    }
-+
-+    if (lavc_param_umv) {
-+      av_dict_set(lavc_venc_opts, "umv", "1", 0);
-+    }
-+
-+    if (lavc_param_data_partitioning) {
-+      av_dict_set(lavc_venc_opts, "vdpart", "1", 0);
-+    }
- 
-     //-- open codec --
-     //----------------
-     TC_LOCK_LIBAVCODEC;
--    ret = avcodec_open(lavc_venc_context, lavc_venc_codec);
-+    ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts);
-     TC_UNLOCK_LIBAVCODEC;
-     if (ret < 0) {
-       tc_log_warn(MOD_NAME, "could not open FFMPEG codec");
-       return TC_EXPORT_ERROR;
-     }
- 
--    if (lavc_venc_context->codec->encode == NULL) {
-+    if (av_codec_is_encoder(lavc_venc_context->codec) == 0) {
-       tc_log_warn(MOD_NAME, "could not open FFMPEG codec "
--              "(lavc_venc_context->codec->encode == NULL)");
-+              "(av_codec_is_encoder(lavc_venc_context->codec) == 0)");
-       return TC_EXPORT_ERROR;
-     }
- 
-diff -urN transcode-1.1.7-orig/export/ffmpeg_cfg.c transcode-1.1.7/export/ffmpeg_cfg.c
---- transcode-1.1.7-orig/export/ffmpeg_cfg.c	2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/export/ffmpeg_cfg.c	2012-07-03 10:09:25.011003254 -0700
-@@ -160,9 +160,9 @@
-     {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
-     {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
-     {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
--    {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
-+    {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1},
- //    {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
--    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
-+    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY},
-     {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
-     {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
-@@ -211,7 +211,7 @@
- #else
-     {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
- #endif    
--    {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV},
-+    {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
-     {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
-     {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
-@@ -223,9 +223,9 @@
-     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
-     {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
-     {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
--    {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT},
--    {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET},
--    {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN},
-+    {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
-+    {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
-+    {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
-     {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
-     {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
-diff -urN transcode-1.1.7-orig/import/decode_lavc.c transcode-1.1.7/import/decode_lavc.c
---- transcode-1.1.7-orig/import/decode_lavc.c	2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/import/decode_lavc.c	2012-07-03 10:21:46.085005182 -0700
-@@ -181,7 +181,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-   lavc_dec_context->error_resilience  = 2;
- #else
--  lavc_dec_context->error_recognition = 2;
-+  lavc_dec_context->err_recognition = 2;
- #endif
-   lavc_dec_context->error_concealment = 3;
-   lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
-diff -urN transcode-1.1.7-orig/import/import_ffmpeg.c transcode-1.1.7/import/import_ffmpeg.c
---- transcode-1.1.7-orig/import/import_ffmpeg.c	2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/import/import_ffmpeg.c	2012-07-03 10:19:36.936004841 -0700
-@@ -314,7 +314,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-     lavc_dec_context->error_resilience  = 2;
- #else
--    lavc_dec_context->error_recognition = 2;
-+    lavc_dec_context->err_recognition = 2;
- #endif
-     lavc_dec_context->error_concealment = 3;
-     lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
-diff -urN transcode-1.1.7-orig/import/probe_ffmpeg.c transcode-1.1.7/import/probe_ffmpeg.c
---- transcode-1.1.7-orig/import/probe_ffmpeg.c	2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/import/probe_ffmpeg.c	2012-07-03 10:41:42.782008306 -0700
-@@ -99,8 +99,8 @@
- 
-     TC_INIT_LIBAVCODEC;
- 
--    ret = av_open_input_file(&lavf_dmx_context, ipipe->name,
--                             NULL, 0, NULL);
-+    ret = avformat_open_input(&lavf_dmx_context, ipipe->name,
-+                             NULL, NULL);
-     if (ret != 0) {
-         tc_log_error(__FILE__, "unable to open '%s'"
-                                " (libavformat failure)",
-diff -urN transcode-1.1.7-orig/libtc/tcavcodec.h transcode-1.1.7/libtc/tcavcodec.h
---- transcode-1.1.7-orig/libtc/tcavcodec.h	2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/libtc/tcavcodec.h	2012-07-03 10:34:43.648007213 -0700
-@@ -53,7 +53,6 @@
- 
- #define TC_INIT_LIBAVCODEC do { \
-     TC_LOCK_LIBAVCODEC; \
--    avcodec_init(); \
-     avcodec_register_all(); \
-     TC_UNLOCK_LIBAVCODEC; \
- } while (0)
diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg.patch
deleted file mode 100644
index be7a6cbaeb3..00000000000
--- a/multimedia/transcode/transcode-1.1.7-ffmpeg.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- encode/encode_lavc.c
-+++ encode/encode_lavc.c
-@@ -955,8 +955,6 @@
-     /* 
-      * context *transcode* (not libavcodec) defaults
-      */
--    pd->ff_vcontext.mb_qmin                 = 2;
--    pd->ff_vcontext.mb_qmax                 = 31;
-     pd->ff_vcontext.max_qdiff               = 3;
-     pd->ff_vcontext.max_b_frames            = 0;
-     pd->ff_vcontext.me_range                = 0;
-@@ -1116,8 +1114,6 @@
-         //  handled by transcode core
-         //  { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
-         //  handled by transcode core
--        { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
--        { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
-         { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
-         { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
-         { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
---- export/ffmpeg_cfg.c
-+++ export/ffmpeg_cfg.c
-@@ -34,8 +34,6 @@
- //int lavc_param_vqscale = 0;
- //int lavc_param_vqmin = 2;
- //int lavc_param_vqmax = 31;
--int lavc_param_mb_qmin = 2;
--int lavc_param_mb_qmax = 31;
- int lavc_param_lmin = 2;
- int lavc_param_lmax = 31;
- int lavc_param_vqdiff = 3;
-@@ -143,8 +141,6 @@
- //    {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
- //    {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
- //    {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
--    {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
--    {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
-     {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
-     {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
-     {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
---- export/ffmpeg_cfg.h
-+++ export/ffmpeg_cfg.h
-@@ -13,8 +13,6 @@
- //extern int lavc_param_vqscale;
- //extern int lavc_param_vqmin;
- //extern int lavc_param_vqmax;
--extern int lavc_param_mb_qmin;
--extern int lavc_param_mb_qmax;
- extern int lavc_param_lmin;
- extern int lavc_param_lmax;
- extern int lavc_param_vqdiff;
diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg2.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg2.patch
deleted file mode 100644
index 9a770a6a0de..00000000000
--- a/multimedia/transcode/transcode-1.1.7-ffmpeg2.patch
+++ /dev/null
@@ -1,557 +0,0 @@
-Fix build with ffmpeg-2.0.
-Fix segfaults introduced by wrong usage of the av_dict API.
-Fix forgotten parts in the libav9 patch.
-
-Index: transcode-1.1.7/encode/encode_lavc.c
-===================================================================
---- transcode-1.1.7.orig/encode/encode_lavc.c
-+++ transcode-1.1.7/encode/encode_lavc.c
-@@ -74,6 +74,9 @@ struct tclavcconfigdata_ {
-     int lmin;
-     int lmax;
-     int me_method;
-+    int luma_elim_threshold;
-+    int chroma_elim_threshold;
-+    int quantizer_noise_shaping;
- 
-     /* same as above for flags */
-     struct {
-@@ -114,7 +117,7 @@ struct tclavcprivatedata_ {
- 
-     AVFrame ff_venc_frame;
-     AVCodecContext ff_vcontext;
--    AVDictionary ** ff_opts;
-+    AVDictionary * ff_opts;
- 
-     AVCodec *ff_vcodec;
- 
-@@ -165,6 +168,7 @@ static const TCCodecID tc_lavc_codecs_ou
-     TC_CODEC_ERROR
- };
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- static const enum CodecID tc_lavc_internal_codecs[] = {
-     CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG4,
-     CODEC_ID_H263I, CODEC_ID_H263P,
-@@ -177,6 +181,20 @@ static const enum CodecID tc_lavc_intern
-     CODEC_ID_MSMPEG4V2, CODEC_ID_MSMPEG4V3,
-     CODEC_ID_NONE
- };
-+#else
-+static const enum AVCodecID tc_lavc_internal_codecs[] = {
-+    AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_MPEG4,
-+    AV_CODEC_ID_H263I, AV_CODEC_ID_H263P,
-+    AV_CODEC_ID_H264,
-+    AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2,
-+    AV_CODEC_ID_RV10,
-+    AV_CODEC_ID_HUFFYUV, AV_CODEC_ID_FFV1,
-+    AV_CODEC_ID_DVVIDEO,
-+    AV_CODEC_ID_MJPEG, AV_CODEC_ID_LJPEG,
-+    AV_CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V3,
-+    AV_CODEC_ID_NONE
-+};
-+#endif
- 
- static const TCFormatID tc_lavc_formats[] = { TC_FORMAT_ERROR };
- 
-@@ -938,7 +956,11 @@ static int tc_lavc_settings_from_vob(TCL
- static void tc_lavc_config_defaults(TCLavcPrivateData *pd)
- {
-     /* first of all reinitialize lavc data */
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-     avcodec_get_context_defaults(&pd->ff_vcontext);
-+#else
-+    avcodec_get_context_defaults3(&pd->ff_vcontext, NULL);
-+#endif
- 
-     pd->confdata.thread_count = 1;
- 
-@@ -976,8 +998,8 @@ static void tc_lavc_config_defaults(TCLa
-     pd->ff_vcontext.mpeg_quant              = 0;
-     pd->ff_vcontext.rc_initial_cplx         = 0.0;
-     pd->ff_vcontext.rc_qsquish              = 1.0;
--    pd->ff_vcontext.luma_elim_threshold     = 0;
--    pd->ff_vcontext.chroma_elim_threshold   = 0;
-+    pd->confdata.luma_elim_threshold     = 0;
-+    pd->confdata.chroma_elim_threshold   = 0;
-     pd->ff_vcontext.strict_std_compliance   = 0;
-     pd->ff_vcontext.dct_algo                = FF_DCT_AUTO;
-     pd->ff_vcontext.idct_algo               = FF_IDCT_AUTO;
-@@ -1001,7 +1023,7 @@ static void tc_lavc_config_defaults(TCLa
-     pd->ff_vcontext.intra_quant_bias        = FF_DEFAULT_QUANT_BIAS;
-     pd->ff_vcontext.inter_quant_bias        = FF_DEFAULT_QUANT_BIAS;
-     pd->ff_vcontext.noise_reduction         = 0;
--    pd->ff_vcontext.quantizer_noise_shaping = 0;
-+    pd->confdata.quantizer_noise_shaping = 0;
-     pd->ff_vcontext.flags                   = 0;
- }
- 
-@@ -1033,7 +1055,6 @@ static void tc_lavc_dispatch_settings(TC
- 
-     pd->ff_vcontext.flags = 0;
-     SET_FLAG(pd, mv0);
--    SET_FLAG(pd, cbp);
-     SET_FLAG(pd, qpel);
-     SET_FLAG(pd, naq);
-     SET_FLAG(pd, ilme);
-@@ -1060,17 +1081,29 @@ static void tc_lavc_dispatch_settings(TC
-         pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
-     }
-     if (pd->confdata.flags.alt) {
--        av_dict_set(pd->ff_opts, "alternate_scan", "1", 0);
-+        av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
-     }
-     if (pd->confdata.flags.vdpart) {
--        av_dict_set(pd->ff_opts, "data_partitioning", "1", 0);
-+        av_dict_set(&(pd->ff_opts), "data_partitioning", "1", 0);
-     }
-     if (pd->confdata.flags.umv) {
--        av_dict_set(pd->ff_opts, "umv", "1", 0);
-+        av_dict_set(&(pd->ff_opts), "umv", "1", 0);
-     }
-     if (pd->confdata.flags.aiv) {
--        av_dict_set(pd->ff_opts, "aiv", "1", 0);
-+        av_dict_set(&(pd->ff_opts), "aiv", "1", 0);
-     }
-+    if (pd->confdata.flags.cbp) {
-+    	av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0);
-+    }
-+
-+    char buf[1024];
-+#define set_dict_opt(val, opt) \
-+    snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
-+    av_dict_set(&(pd->ff_opts), opt, buf, 0)
-+
-+    set_dict_opt(luma_elim_threshold, "luma_elim_threshold");
-+    set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold");
-+    set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping");
- }
- 
- #undef SET_FLAG
-@@ -1155,8 +1188,8 @@ static int tc_lavc_read_config(TCLavcPri
-         { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
-         //  { "vrc_init_occupancy",   }, // not yet supported
-         { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
--        { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
--        { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-+        { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-+        { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-         { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-         { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 },
-         { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
-@@ -1182,12 +1215,12 @@ static int tc_lavc_read_config(TCLavcPri
-         { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
-         { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
-         { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
--        { "qns", PCTX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
-+        { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
-         { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
-         { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
-     
-         { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
--        { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
-+        { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
-         { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
-         { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
-         { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
-@@ -1350,6 +1383,8 @@ static int tc_lavc_configure(TCModuleIns
- 
-     pd = self->userdata;
- 
-+    pd->ff_opts = NULL;
-+
-     pd->flush_flag = vob->encoder_flush;
-     
-     /* FIXME: move into core? */
-@@ -1402,7 +1437,7 @@ static int tc_lavc_configure(TCModuleIns
-     }
- 
-     TC_LOCK_LIBAVCODEC;
--    ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts);
-+    ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, &(pd->ff_opts));
-     TC_UNLOCK_LIBAVCODEC;
- 
-     if (ret < 0) {
-Index: transcode-1.1.7/export/export_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/export/export_ffmpeg.c
-+++ transcode-1.1.7/export/export_ffmpeg.c
-@@ -122,7 +122,7 @@ static uint8_t             *img_buffer =
- static AVFrame             *lavc_convert_frame = NULL;
- 
- static AVCodec             *lavc_venc_codec = NULL;
--static AVDictionary        **lavc_venc_opts = NULL;
-+static AVDictionary        *lavc_venc_opts = NULL;
- static AVFrame             *lavc_venc_frame = NULL;
- static AVCodecContext      *lavc_venc_context;
- static avi_t               *avifile = NULL;
-@@ -486,7 +486,7 @@ MOD_init
- 		            codec->name, codec->fourCC, codec->comments);
-     }
- 
--    lavc_venc_context = avcodec_alloc_context();
-+    lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec);
-     lavc_venc_frame   = avcodec_alloc_frame();
- 
-     lavc_convert_frame= avcodec_alloc_frame();
-@@ -838,8 +838,13 @@ MOD_init
-     lavc_venc_context->rc_strategy        = lavc_param_vrc_strategy;
-     lavc_venc_context->b_frame_strategy   = lavc_param_vb_strategy;
-     lavc_venc_context->b_quant_offset     = lavc_param_vb_qoffset;
--    lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold;
--    lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold;
-+
-+    char buf[1024];
-+#define set_dict_opt(val, opt) \
-+	snprintf(buf, sizeof(buf), "%i", val); \
-+	av_dict_set(&lavc_venc_opts, opt, buf, 0)
-+    set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold");
-+    set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold");
-     lavc_venc_context->rtp_payload_size   = lavc_param_packet_size;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
-     if (lavc_param_packet_size)
-@@ -870,7 +875,7 @@ MOD_init
-     lavc_venc_context->context_model      = lavc_param_context;
-     lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
-     lavc_venc_context->noise_reduction    = lavc_param_noise_reduction;
--    lavc_venc_context->inter_threshold    = lavc_param_inter_threshold;
-+    set_dict_opt(lavc_param_inter_threshold, "inter_threshold");
-     lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision;
-     lavc_venc_context->skip_top           = lavc_param_skip_top;
-     lavc_venc_context->skip_bottom        = lavc_param_skip_bottom;
-@@ -1066,9 +1071,11 @@ MOD_init
-     lavc_venc_context->flags |= lavc_param_trunc;
-     lavc_venc_context->flags |= lavc_param_aic;
-     lavc_venc_context->flags |= lavc_param_v4mv;
--    lavc_venc_context->flags |= lavc_param_cbp;
-+    if(lavc_param_cbp)
-+    	av_dict_set(&lavc_venc_opts, "mpv_flags", "+cbp_rd", 0);
-     lavc_venc_context->flags |= lavc_param_mv0;
--    lavc_venc_context->flags |= lavc_param_qp_rd;
-+    if(lavc_param_qp_rd)
-+    	av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0);
-     lavc_venc_context->flags |= lavc_param_ilme;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
-     lavc_venc_context->flags |= lavc_param_trell;
-@@ -1238,29 +1245,29 @@ MOD_init
- 	}
- 
-     if (lavc_param_scan_offset) {
--      av_dict_set(lavc_venc_opts, "scan_offset", "1", 0);
-+      av_dict_set(&lavc_venc_opts, "scan_offset", "1", 0);
-     }
- 
-     if (lavc_param_ss) {
--      av_dict_set(lavc_venc_opts, "structured_slices", "1", 0);
-+      av_dict_set(&lavc_venc_opts, "structured_slices", "1", 0);
-     }
- 
-     if (lavc_param_alt) {
--      av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0);
-+      av_dict_set(&lavc_venc_opts, "alternate_scan", "1", 0);
-     }
- 
-     if (lavc_param_umv) {
--      av_dict_set(lavc_venc_opts, "umv", "1", 0);
-+      av_dict_set(&lavc_venc_opts, "umv", "1", 0);
-     }
- 
-     if (lavc_param_data_partitioning) {
--      av_dict_set(lavc_venc_opts, "vdpart", "1", 0);
-+      av_dict_set(&lavc_venc_opts, "vdpart", "1", 0);
-     }
- 
-     //-- open codec --
-     //----------------
-     TC_LOCK_LIBAVCODEC;
--    ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts);
-+    ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, &lavc_venc_opts);
-     TC_UNLOCK_LIBAVCODEC;
-     if (ret < 0) {
-       tc_log_warn(MOD_NAME, "could not open FFMPEG codec");
-Index: transcode-1.1.7/export/ffmpeg_cfg.c
-===================================================================
---- transcode-1.1.7.orig/export/ffmpeg_cfg.c
-+++ transcode-1.1.7/export/ffmpeg_cfg.c
-@@ -214,10 +214,10 @@ TCConfigEntry lavcopts_conf[]={
-     {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
-     {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
-     {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
--    {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD},
-+    {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
-     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
--    {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
-+    {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
-     {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
-Index: transcode-1.1.7/export/aud_aux.c
-===================================================================
---- transcode-1.1.7.orig/export/aud_aux.c
-+++ transcode-1.1.7/export/aud_aux.c
-@@ -326,10 +326,18 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec)
- 
-     switch (o_codec) {
-       case   0x50:
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-         codeid = CODEC_ID_MP2;
-+#else
-+        codeid = AV_CODEC_ID_MP2;
-+#endif
-         break;
-       case 0x2000:
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-         codeid = CODEC_ID_AC3;
-+#else
-+        codeid = AV_CODEC_ID_AC3;
-+#endif
-         break;
-       default:
-         tc_warn("cannot init ffmpeg with %x", o_codec);
-@@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
- 
-     //-- set parameters (bitrate, channels and sample-rate) --
-     //--------------------------------------------------------
--    avcodec_get_context_defaults(&mpa_ctx);
-+    avcodec_get_context_defaults3(&mpa_ctx, mpa_codec);
- #if LIBAVCODEC_VERSION_MAJOR < 53
-     mpa_ctx.codec_type  = CODEC_TYPE_AUDIO;
- #else
-@@ -359,7 +359,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
-     //-- open codec --
-     //----------------
-     TC_LOCK_LIBAVCODEC;
--    ret = avcodec_open(&mpa_ctx, mpa_codec);
-+    ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL);
-     TC_UNLOCK_LIBAVCODEC;
-     if (ret < 0) {
-         tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",
-@@ -371,7 +371,12 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec)
-     TC_UNLOCK_LIBAVCODEC;
-     if (ret < 0) {
-         tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",
--                (codeid == CODEC_ID_MP2) ?"mpa" :"ac3");
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-+                (codeid == CODEC_ID_MP2)
-+#else
-+                (codeid == AV_CODEC_ID_MP2)
-+#endif
-+                ?"mpa" :"ac3");
-         return(TC_EXPORT_ERROR);
-     }
- 
-Index: transcode-1.1.7/import/import_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/import/import_ffmpeg.c
-+++ transcode-1.1.7/import/import_ffmpeg.c
-@@ -58,6 +58,7 @@ struct ffmpeg_codec {
- };
- 
- // fourCC to ID mapping taken from MPlayer's codecs.conf
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- static struct ffmpeg_codec ffmpeg_codecs[] = {
-   {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
-     {"MP41", "DIV1", ""}},
-@@ -106,6 +107,56 @@ static struct ffmpeg_codec ffmpeg_codecs[] = {
-   {CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",
-     {"Y42B", ""}},
-   {0, TC_CODEC_UNKNOWN, NULL, {""}}};
-+#else
-+static struct ffmpeg_codec ffmpeg_codecs[] = {
-+  {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
-+    {"MP41", "DIV1", ""}},
-+  {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
-+    {"MP42", "DIV2", ""}},
-+  {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
-+    {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}},
-+  {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
-+    {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}},
-+  {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
-+    {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}},
-+  {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video",
-+    {"MPG1", ""}},
-+  {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
-+    {"DVSD", ""}},
-+  {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
-+    {"WMV1", ""}},
-+  {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
-+    {"WMV2", ""}},
-+  {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
-+    {"HFYU", ""}},
-+  {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
-+    {"I263", ""}},
-+  {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
-+    {"H263", "U263", "VIV1", ""}},
-+  {AV_CODEC_ID_H264, TC_CODEC_H264, "h264",
-+    {"H264", "h264", "X264", "x264", "avc1", ""}},
-+  {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
-+    {"RV10", "RV13", ""}},
-+  {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
-+    {"SVQ1", ""}},
-+  {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
-+    {"SVQ3", ""}},
-+  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
-+    {"MPG2", ""}},
-+  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video",
-+    {"MPG2", ""}},
-+  {AV_CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1",
-+    {"ASV1", ""}},
-+  {AV_CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2",
-+    {"ASV2", ""}},
-+  {AV_CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1",
-+    {"FFV1", ""}},
-+  {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw",
-+    {"I420", "IYUV", ""}},
-+  {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",
-+    {"Y42B", ""}},
-+  {0, TC_CODEC_UNKNOWN, NULL, {""}}};
-+#endif
- 
- #define BUFFER_SIZE SIZE_RGB_FRAME
- 
-@@ -302,7 +302,7 @@ do_avi:
- 
-     // Set these to the expected values so that ffmpeg's decoder can
-     // properly detect interlaced input.
--    lavc_dec_context = avcodec_alloc_context();
-+    lavc_dec_context = avcodec_alloc_context3(lavc_dec_codec);
-     if (lavc_dec_context == NULL) {
-       tc_log_error(MOD_NAME, "Could not allocate enough memory.");
-       return TC_IMPORT_ERROR;
-@@ -324,6 +375,7 @@ do_avi:
-     // XXX: some codecs need extra data
-     switch (codec->id)
-     {
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-       case CODEC_ID_MJPEG: extra_data_size  = 28; break;
-       case CODEC_ID_LJPEG: extra_data_size  = 28; break;
-       case CODEC_ID_HUFFYUV: extra_data_size = 1000; break;
-@@ -331,6 +383,15 @@ do_avi:
-       case CODEC_ID_ASV2: extra_data_size = 8; break;
-       case CODEC_ID_WMV1: extra_data_size = 4; break;
-       case CODEC_ID_WMV2: extra_data_size = 4; break;
-+#else
-+      case AV_CODEC_ID_MJPEG: extra_data_size  = 28; break;
-+      case AV_CODEC_ID_LJPEG: extra_data_size  = 28; break;
-+      case AV_CODEC_ID_HUFFYUV: extra_data_size = 1000; break;
-+      case AV_CODEC_ID_ASV1: extra_data_size = 8; break;
-+      case AV_CODEC_ID_ASV2: extra_data_size = 8; break;
-+      case AV_CODEC_ID_WMV1: extra_data_size = 4; break;
-+      case AV_CODEC_ID_WMV2: extra_data_size = 4; break;
-+#endif
-       default: extra_data_size = 0; break;
-     }
- 
-@@ -344,7 +344,7 @@ do_avi:
-     }
- 
-     TC_LOCK_LIBAVCODEC;
--    ret = avcodec_open(lavc_dec_context, lavc_dec_codec);
-+    ret = avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL);
-     TC_UNLOCK_LIBAVCODEC;
-     if (ret < 0) {
-       tc_log_warn(MOD_NAME, "Could not initialize the '%s' codec.",
-@@ -360,7 +421,11 @@ do_avi:
-         frame_size = x_dim*y_dim + 2*UV_PLANE_SIZE(IMG_YUV_DEFAULT,x_dim,y_dim);
- 
- 	// we adapt the color space
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-         if(codec->id == CODEC_ID_MJPEG) {
-+#else
-+        if(codec->id == AV_CODEC_ID_MJPEG) {
-+#endif
- 	  enable_levels_filter();
-         }
-         break;
-@@ -434,7 +499,11 @@ do_dv:
-       }
- 
-       // we adapt the color space
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-       if(codec->id == CODEC_ID_MJPEG) {
-+#else
-+      if(codec->id == AV_CODEC_ID_MJPEG) {
-+#endif
-         enable_levels_filter();
-       }
- 
-@@ -504,13 +573,25 @@ MOD_decode {
-       int bkey = 0;
- 
-       // check for keyframes
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-       if (codec->id == CODEC_ID_MSMPEG4V3) {
-+#else
-+      if (codec->id == AV_CODEC_ID_MSMPEG4V3) {
-+#endif
- 	if (divx3_is_key(buffer)) bkey = 1;
-       }
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-       else if (codec->id == CODEC_ID_MPEG4) {
-+#else
-+      else if (codec->id == AV_CODEC_ID_MPEG4) {
-+#endif
- 	if (mpeg4_is_key(buffer, bytes_read)) bkey = 1;
-       }
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-       else if (codec->id == CODEC_ID_MJPEG) {
-+#else
-+      else if (codec->id == AV_CODEC_ID_MJPEG) {
-+#endif
- 	bkey = 1;
-       }
- 
---- a/import/decode_lavc.c
-+++ b/import/decode_lavc.c
-@@ -57,6 +57,7 @@ struct ffmpeg_codec {
- };
- 
- // fourCC to ID mapping taken from MPlayer's codecs.conf
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- static struct ffmpeg_codec ffmpeg_codecs[] = {
-   {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
-     {"MP41", "DIV1", ""}},
-@@ -91,6 +92,42 @@ static struct ffmpeg_codec ffmpeg_codecs[] = {
-   {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
-     {"MPG2", ""}},
-   {0, TC_CODEC_UNKNOWN, NULL, {""}}};
-+#else
-+static struct ffmpeg_codec ffmpeg_codecs[] = {
-+  {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
-+    {"MP41", "DIV1", ""}},
-+  {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
-+    {"MP42", "DIV2", ""}},
-+  {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
-+    {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}},
-+  {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
-+    {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}},
-+  {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
-+    {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}},
-+  {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video",
-+    {"MPG1", ""}},
-+  {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
-+    {"DVSD", ""}},
-+  {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
-+    {"WMV1", ""}},
-+  {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
-+    {"WMV2", ""}},
-+  {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
-+    {"HFYU", ""}},
-+  {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
-+    {"I263", ""}},
-+  {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
-+    {"H263", "U263", "VIV1", ""}},
-+  {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
-+    {"RV10", "RV13", ""}},
-+  {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
-+    {"SVQ1", ""}},
-+  {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
-+    {"SVQ3", ""}},
-+  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
-+    {"MPG2", ""}},
-+  {0, TC_CODEC_UNKNOWN, NULL, {""}}};
-+#endif
- 
- 
- static struct ffmpeg_codec *find_ffmpeg_codec_id(unsigned int transcode_id)
diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg24.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg24.patch
deleted file mode 100644
index 57a91774abc..00000000000
--- a/multimedia/transcode/transcode-1.1.7-ffmpeg24.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=520190
-
-Index: transcode-1.1.7/import/probe_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/import/probe_ffmpeg.c
-+++ transcode-1.1.7/import/probe_ffmpeg.c
-@@ -120,7 +120,11 @@ void probe_ffmpeg(info_t *ipipe)
- 
-     translate_info(lavf_dmx_context, ipipe->probe_info);
- 
-+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,25,0)
-+    avformat_close_input(&lavf_dmx_context);
-+#else
-     av_close_input_file(lavf_dmx_context);
-+#endif
-     return;
- }
- 
diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg29.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg29.patch
deleted file mode 100644
index 7901fc3cc34..00000000000
--- a/multimedia/transcode/transcode-1.1.7-ffmpeg29.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-Index: transcode-1.1.7/encode/encode_lavc.c
-===================================================================
---- transcode-1.1.7.orig/encode/encode_lavc.c
-+++ transcode-1.1.7/encode/encode_lavc.c
-@@ -233,7 +233,7 @@ static void pre_encode_video_yuv420p(TCL
-                                      vframe_list_t *vframe)
- {
-     avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf,
--                    PIX_FMT_YUV420P,
-+                    AV_PIX_FMT_YUV420P,
-                     pd->ff_vcontext.width, pd->ff_vcontext.height);
- }
- 
-@@ -247,7 +247,7 @@ static void pre_encode_video_yuv420p_huf
-                     IMG_YUV_DEFAULT,
-                     pd->ff_vcontext.width, pd->ff_vcontext.height);
-     avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
--                   PIX_FMT_YUV422P,
-+                   AV_PIX_FMT_YUV422P,
-                    pd->ff_vcontext.width, pd->ff_vcontext.height);
-     ac_imgconvert(src, IMG_YUV_DEFAULT,
-                   pd->ff_venc_frame.data, IMG_YUV422P,
-@@ -263,7 +263,7 @@ static void pre_encode_video_yuv422p(TCL
-                     IMG_YUV422P,
-                     pd->ff_vcontext.width, pd->ff_vcontext.height);
-     avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
--                   PIX_FMT_YUV420P,
-+                   AV_PIX_FMT_YUV420P,
-                    pd->ff_vcontext.width, pd->ff_vcontext.height);
-     ac_imgconvert(src, IMG_YUV422P,
-                   pd->ff_venc_frame.data, IMG_YUV420P,
-@@ -275,7 +275,7 @@ static void pre_encode_video_yuv422p_huf
-                                              vframe_list_t *vframe)
- {
-     avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf,
--                   PIX_FMT_YUV422P,
-+                   AV_PIX_FMT_YUV422P,
-                    pd->ff_vcontext.width, pd->ff_vcontext.height);
- 
- }
-@@ -285,7 +285,7 @@ static void pre_encode_video_rgb24(TCLav
-                                    vframe_list_t *vframe)
- {
-     avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
--                   PIX_FMT_YUV420P,
-+                   AV_PIX_FMT_YUV420P,
-                    pd->ff_vcontext.width, pd->ff_vcontext.height);
-     ac_imgconvert(&vframe->video_buf, IMG_RGB_DEFAULT,
-                   pd->ff_venc_frame.data, IMG_YUV420P,
-@@ -610,21 +610,21 @@ static int tc_lavc_set_pix_fmt(TCLavcPri
-       case CODEC_YUV:
-         if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) {
-             pd->tc_pix_fmt = TC_CODEC_YUV422P;
--            pd->ff_vcontext.pix_fmt = PIX_FMT_YUV422P;
-+            pd->ff_vcontext.pix_fmt = AV_PIX_FMT_YUV422P;
-             pd->pre_encode_video = pre_encode_video_yuv420p_huffyuv;
-         } else {
-             pd->tc_pix_fmt = TC_CODEC_YUV420P;
-             pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) 
--                                       ? PIX_FMT_YUVJ420P
--                                       : PIX_FMT_YUV420P;
-+                                       ? AV_PIX_FMT_YUVJ420P
-+                                       : AV_PIX_FMT_YUV420P;
-             pd->pre_encode_video = pre_encode_video_yuv420p;
-         }
-         break;
-       case CODEC_YUV422:
-         pd->tc_pix_fmt = TC_CODEC_YUV422P;
-         pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) 
--                                   ? PIX_FMT_YUVJ422P
--                                   : PIX_FMT_YUV422P;
-+                                   ? AV_PIX_FMT_YUVJ422P
-+                                   : AV_PIX_FMT_YUV422P;
-         if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) {
-             pd->pre_encode_video = pre_encode_video_yuv422p_huffyuv;
-         } else {
-@@ -634,10 +634,10 @@ static int tc_lavc_set_pix_fmt(TCLavcPri
-       case CODEC_RGB:
-         pd->tc_pix_fmt = TC_CODEC_RGB;
-         pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV)
--                                        ? PIX_FMT_YUV422P
-+                                        ? AV_PIX_FMT_YUV422P
-                                         : (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) 
--                                           ? PIX_FMT_YUVJ420P
--                                           : PIX_FMT_YUV420P;
-+                                           ? AV_PIX_FMT_YUVJ420P
-+                                           : AV_PIX_FMT_YUV420P;
-         pd->pre_encode_video = pre_encode_video_rgb24;
-         break;
-       default:
-@@ -1390,7 +1390,7 @@ static int tc_lavc_configure(TCModuleIns
-     /* FIXME: move into core? */
-     TC_INIT_LIBAVCODEC;
- 
--    avcodec_get_frame_defaults(&pd->ff_venc_frame);
-+    av_frame_unref(&pd->ff_venc_frame);
-     /*
-      * auxiliary config data needs to be blanked too
-      * before any other operation
-@@ -1523,6 +1523,8 @@ static int tc_lavc_encode_video(TCModule
-                                 vframe_list_t *outframe)
- {
-     TCLavcPrivateData *pd = NULL;
-+    AVPacket pkt;
-+    int ret, got_packet = 0;
- 
-     TC_MODULE_SELF_CHECK(self, "encode_video");
- 
-@@ -1537,12 +1539,15 @@ static int tc_lavc_encode_video(TCModule
- 
-     pd->pre_encode_video(pd, inframe); 
- 
-+    av_init_packet(&pkt);
-+    pkt.data = outframe->video_buf;
-+    pkt.size = inframe->video_size;
-+
-     TC_LOCK_LIBAVCODEC;
--    outframe->video_len = avcodec_encode_video(&pd->ff_vcontext,
--                                               outframe->video_buf,
--                                               inframe->video_size,
--                                               &pd->ff_venc_frame);
-+    ret = avcodec_encode_video2(&pd->ff_vcontext,   &pkt,
-+    				&pd->ff_venc_frame, &got_packet);
-     TC_UNLOCK_LIBAVCODEC;
-+    outframe->video_len = ret ? ret : pkt.size;
- 
-     if (outframe->video_len < 0) {
-         tc_log_warn(MOD_NAME, "encoder error: size (%i)",
-Index: transcode-1.1.7/export/export_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/export/export_ffmpeg.c
-+++ transcode-1.1.7/export/export_ffmpeg.c
-@@ -250,9 +250,9 @@ int opt_default(const char *opt, const c
-     for(type=0; type= 0; type++){
- 		/* GLUE: +if */
- 		if (type == AVMEDIA_TYPE_VIDEO) {
--        const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]);
--        if(o2)
--            ret = av_set_string3(avcodec_opts[type], opt, arg, 1, &o);
-+        o = av_opt_find(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]);
-+        if(o)
-+            ret = av_opt_set(avcodec_opts[type], opt, arg, 0);
- 		/* GLUE: +if */
- 		}
-     }
-@@ -267,7 +267,10 @@ int opt_default(const char *opt, const c
-         if(opt[0] == 'a')
-             ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_AUDIO], opt+1, arg, 1, &o);
-         else */ if(opt[0] == 'v')
--            ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 1, &o);
-+	{
-+	    o = av_opt_find(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, NULL, 0, 0);
-+            ret = av_opt_set(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 0);
-+	}
- 		/* GLUE: disabling
-         else if(opt[0] == 's')
-             ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], opt+1, arg, 1, &o);
-@@ -487,10 +490,10 @@ MOD_init
-     }
- 
-     lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec);
--    lavc_venc_frame   = avcodec_alloc_frame();
-+    lavc_venc_frame   = av_frame_alloc();
- 
--    lavc_convert_frame= avcodec_alloc_frame();
--    size = avpicture_get_size(PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height);
-+    lavc_convert_frame= av_frame_alloc();
-+    size = avpicture_get_size(AV_PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height);
-     enc_buffer = tc_malloc(size);
- 
-     if (lavc_venc_context == NULL || !enc_buffer || !lavc_convert_frame) {
-@@ -1114,7 +1117,7 @@ MOD_init
-     lavc_venc_context->prediction_method = lavc_param_prediction_method;
- 
-     if(is_huffyuv)
--        lavc_venc_context->pix_fmt = PIX_FMT_YUV422P;
-+        lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P;
-     else
-     {
-         switch(pix_fmt)
-@@ -1123,18 +1126,18 @@ MOD_init
-             case CODEC_RGB:
-             {
-                 if(is_mjpeg)
--                    lavc_venc_context->pix_fmt = PIX_FMT_YUVJ420P;
-+                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ420P;
-                 else
--                    lavc_venc_context->pix_fmt = PIX_FMT_YUV420P;
-+                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV420P;
-                 break;
-             }
- 
-             case CODEC_YUV422:
-             {
-                 if(is_mjpeg)
--                    lavc_venc_context->pix_fmt = PIX_FMT_YUVJ422P;
-+                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ422P;
-                 else
--                    lavc_venc_context->pix_fmt = PIX_FMT_YUV422P;
-+                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P;
-                 break;
-             }
- 
-@@ -1596,6 +1599,8 @@ MOD_encode
- 
-   int out_size;
-   const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'};
-+  AVPacket pkt;
-+  int ret, got_packet = 0;
- 
-   if (param->flag == TC_VIDEO) {
- 
-@@ -1620,7 +1625,7 @@ MOD_encode
- 	        	YUV_INIT_PLANES(src, param->buffer, IMG_YUV_DEFAULT,
- 			                	lavc_venc_context->width, lavc_venc_context->height);
-                 avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer,
--                               PIX_FMT_YUV422P, lavc_venc_context->width,
-+                               AV_PIX_FMT_YUV422P, lavc_venc_context->width,
-                                lavc_venc_context->height);
-         		/* FIXME: can't use tcv_convert (see decode_lavc.c) */
-                 ac_imgconvert(src, IMG_YUV_DEFAULT,
-@@ -1650,7 +1655,7 @@ MOD_encode
- 		                		lavc_venc_context->width,
-                                 lavc_venc_context->height);
-                 avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer,
--                               PIX_FMT_YUV420P, lavc_venc_context->width,
-+                               AV_PIX_FMT_YUV420P, lavc_venc_context->width,
-                                lavc_venc_context->height);
-                 ac_imgconvert(src, IMG_YUV422P,
-                               lavc_venc_frame->data, IMG_YUV420P,
-@@ -1661,7 +1666,7 @@ MOD_encode
- 
-         case CODEC_RGB:
-             avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer,
--                           PIX_FMT_YUV420P, lavc_venc_context->width,
-+                           AV_PIX_FMT_YUV420P, lavc_venc_context->width,
-                            lavc_venc_context->height);
-     	    ac_imgconvert(¶m->buffer, IMG_RGB_DEFAULT,
-                               lavc_venc_frame->data, IMG_YUV420P,
-@@ -1674,13 +1679,17 @@ MOD_encode
-               return TC_EXPORT_ERROR;
-     }
- 
-+    av_init_packet(&pkt);
-+    pkt.data = enc_buffer;
-+    pkt.size = size;
- 
-     TC_LOCK_LIBAVCODEC;
--    out_size = avcodec_encode_video(lavc_venc_context,
--                                    enc_buffer, size,
--                                    lavc_venc_frame);
-+    ret = avcodec_encode_video2(lavc_venc_context, &pkt,
-+                                    lavc_venc_frame, &got_packet);
-     TC_UNLOCK_LIBAVCODEC;
- 
-+    out_size = ret ? ret : pkt.size;
-+
-     if (out_size < 0) {
-       tc_log_warn(MOD_NAME, "encoder error: size (%d)", out_size);
-       return TC_EXPORT_ERROR;
-Index: transcode-1.1.7/import/decode_lavc.c
-===================================================================
---- transcode-1.1.7.orig/import/decode_lavc.c
-+++ transcode-1.1.7/import/decode_lavc.c
-@@ -327,8 +327,8 @@ void decode_lavc(decode_t *decode)
- 
-       // Convert avcodec image to the requested YUV or RGB format
-       switch (lavc_dec_context->pix_fmt) {
--	case PIX_FMT_YUVJ420P:
--	case PIX_FMT_YUV420P:
-+	case AV_PIX_FMT_YUVJ420P:
-+	case AV_PIX_FMT_YUV420P:
- 	    // Remove "dead space" at right edge of planes, if any
- 	    if (picture.linesize[0] != lavc_dec_context->width) {
- 		int y;
-@@ -352,7 +352,7 @@ void decode_lavc(decode_t *decode)
- 			  pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT,
- 			  lavc_dec_context->width, lavc_dec_context->height);
- 	    break;
--	case PIX_FMT_YUV411P:
-+	case AV_PIX_FMT_YUV411P:
- 	    if (picture.linesize[0] != lavc_dec_context->width) {
- 		int y;
- 		for (y = 0; y < lavc_dec_context->height; y++) {
-@@ -371,8 +371,8 @@ void decode_lavc(decode_t *decode)
- 			  pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT,
- 			  lavc_dec_context->width, lavc_dec_context->height);
- 	    break;
--	case PIX_FMT_YUVJ422P:
--	case PIX_FMT_YUV422P:
-+	case AV_PIX_FMT_YUVJ422P:
-+	case AV_PIX_FMT_YUV422P:
- 	    if (picture.linesize[0] != lavc_dec_context->width) {
- 		int y;
- 		for (y = 0; y < lavc_dec_context->height; y++) {
-@@ -391,8 +391,8 @@ void decode_lavc(decode_t *decode)
- 			  pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT,
- 			  lavc_dec_context->width, lavc_dec_context->height);
- 	    break;
--	case PIX_FMT_YUVJ444P:
--	case PIX_FMT_YUV444P:
-+	case AV_PIX_FMT_YUVJ444P:
-+	case AV_PIX_FMT_YUV444P:
- 	    if (picture.linesize[0] != lavc_dec_context->width) {
- 		int y;
- 		for (y = 0; y < lavc_dec_context->height; y++) {
-Index: transcode-1.1.7/import/import_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/import/import_ffmpeg.c
-+++ transcode-1.1.7/import/import_ffmpeg.c
-@@ -661,8 +661,8 @@ retry:
- 
-     // Convert avcodec image to our internal YUV or RGB format
-     switch (lavc_dec_context->pix_fmt) {
--      case PIX_FMT_YUVJ420P:
--      case PIX_FMT_YUV420P:
-+      case AV_PIX_FMT_YUVJ420P:
-+      case AV_PIX_FMT_YUV420P:
-         src_fmt = IMG_YUV420P;
-         YUV_INIT_PLANES(src_planes, frame, src_fmt,
-                         lavc_dec_context->width, lavc_dec_context->height);
-@@ -693,7 +693,7 @@ retry:
- 	}
-         break;
- 
--      case PIX_FMT_YUV411P:
-+      case AV_PIX_FMT_YUV411P:
-         src_fmt = IMG_YUV411P;
-         YUV_INIT_PLANES(src_planes, frame, src_fmt,
-                         lavc_dec_context->width, lavc_dec_context->height);
-@@ -721,8 +721,8 @@ retry:
-         }
-         break;
- 
--      case PIX_FMT_YUVJ422P:
--      case PIX_FMT_YUV422P:
-+      case AV_PIX_FMT_YUVJ422P:
-+      case AV_PIX_FMT_YUV422P:
-         src_fmt = IMG_YUV422P;
-         YUV_INIT_PLANES(src_planes, frame, src_fmt,
-                         lavc_dec_context->width, lavc_dec_context->height);
-@@ -750,8 +750,8 @@ retry:
-         }
- 	break;
- 
--      case PIX_FMT_YUVJ444P:
--      case PIX_FMT_YUV444P:
-+      case AV_PIX_FMT_YUVJ444P:
-+      case AV_PIX_FMT_YUV444P:
-         src_fmt = IMG_YUV444P;
-         YUV_INIT_PLANES(src_planes, frame, src_fmt,
-                         lavc_dec_context->width, lavc_dec_context->height);
diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch
deleted file mode 100644
index 9ad765e1c37..00000000000
--- a/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch
+++ /dev/null
@@ -1,508 +0,0 @@
-Index: transcode-1.1.7/encode/encode_lavc.c
-===================================================================
---- transcode-1.1.7.orig/encode/encode_lavc.c
-+++ transcode-1.1.7/encode/encode_lavc.c
-@@ -77,6 +77,13 @@ struct tclavcconfigdata_ {
-     int luma_elim_threshold;
-     int chroma_elim_threshold;
-     int quantizer_noise_shaping;
-+    int inter_quant_bias;
-+    int intra_quant_bias;
-+    int scenechange_factor;
-+    int rc_strategy;
-+    float rc_initial_cplx;
-+    float rc_qsquish;
-+    float border_masking;
- 
-     /* same as above for flags */
-     struct {
-@@ -684,7 +691,7 @@ static int tc_lavc_init_multipass(TCLavc
-     switch (vob->divxmultipass) {
-       case 1:
-         CAN_DO_MULTIPASS(multipass_flag);
--        pd->ff_vcontext.flags |= CODEC_FLAG_PASS1;
-+        pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS1;
-         pd->stats_file = fopen(vob->divxlogfile, "w");
-         if (pd->stats_file == NULL) {
-             tc_log_error(MOD_NAME, "could not create 2pass log file"
-@@ -694,7 +701,7 @@ static int tc_lavc_init_multipass(TCLavc
-         break;
-       case 2:
-         CAN_DO_MULTIPASS(multipass_flag);
--        pd->ff_vcontext.flags |= CODEC_FLAG_PASS2;
-+        pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS2;
-         pd->stats_file = fopen(vob->divxlogfile, "r");
-         if (pd->stats_file == NULL){
-             tc_log_error(MOD_NAME, "could not open 2pass log file \"%s\""
-@@ -723,7 +730,7 @@ static int tc_lavc_init_multipass(TCLavc
-         break;
-       case 3:
-         /* fixed qscale :p */
--        pd->ff_vcontext.flags |= CODEC_FLAG_QSCALE;
-+        pd->ff_vcontext.flags |= AV_CODEC_FLAG_QSCALE;
-         pd->ff_venc_frame.quality = vob->divxbitrate;
-         break;
-     }
-@@ -970,7 +977,7 @@ static void tc_lavc_config_defaults(TCLa
-     pd->confdata.rc_buffer_size  = 0;
-     pd->confdata.lmin            = 2;
-     pd->confdata.lmax            = 31;
--    pd->confdata.me_method       = ME_EPZS;
-+    pd->confdata.me_method       = 0;
- 
-     memset(&pd->confdata.flags, 0, sizeof(pd->confdata.flags));
-     pd->confdata.turbo_setup = 0;
-@@ -983,12 +990,12 @@ static void tc_lavc_config_defaults(TCLa
-     pd->ff_vcontext.me_range                = 0;
-     pd->ff_vcontext.mb_decision             = 0;
-     pd->ff_vcontext.scenechange_threshold   = 0;
--    pd->ff_vcontext.scenechange_factor      = 1;
-+    pd->confdata.scenechange_factor         = 1;
-     pd->ff_vcontext.b_frame_strategy        = 0;
-     pd->ff_vcontext.b_sensitivity           = 40;
-     pd->ff_vcontext.brd_scale               = 0;
-     pd->ff_vcontext.bidir_refine            = 0;
--    pd->ff_vcontext.rc_strategy             = 2;
-+    pd->confdata.rc_strategy                = 2;
-     pd->ff_vcontext.b_quant_factor          = 1.25;
-     pd->ff_vcontext.i_quant_factor          = 0.8;
-     pd->ff_vcontext.b_quant_offset          = 1.25;
-@@ -996,8 +1003,8 @@ static void tc_lavc_config_defaults(TCLa
-     pd->ff_vcontext.qblur                   = 0.5;
-     pd->ff_vcontext.qcompress               = 0.5;
-     pd->ff_vcontext.mpeg_quant              = 0;
--    pd->ff_vcontext.rc_initial_cplx         = 0.0;
--    pd->ff_vcontext.rc_qsquish              = 1.0;
-+    pd->confdata.rc_initial_cplx            = 0.0;
-+    pd->confdata.rc_qsquish              = 1.0;
-     pd->confdata.luma_elim_threshold     = 0;
-     pd->confdata.chroma_elim_threshold   = 0;
-     pd->ff_vcontext.strict_std_compliance   = 0;
-@@ -1008,7 +1015,7 @@ static void tc_lavc_config_defaults(TCLa
-     pd->ff_vcontext.temporal_cplx_masking   = 0.0;
-     pd->ff_vcontext.spatial_cplx_masking    = 0.0;
-     pd->ff_vcontext.p_masking               = 0.0;
--    pd->ff_vcontext.border_masking          = 0.0;
-+    pd->confdata.border_masking          = 0.0;
-     pd->ff_vcontext.me_pre_cmp              = 0;
-     pd->ff_vcontext.me_cmp                  = 0;
-     pd->ff_vcontext.me_sub_cmp              = 0;
-@@ -1020,8 +1027,6 @@ static void tc_lavc_config_defaults(TCLa
-     pd->ff_vcontext.pre_me                  = 1;
-     pd->ff_vcontext.me_subpel_quality       = 8;
-     pd->ff_vcontext.refs                    = 1;
--    pd->ff_vcontext.intra_quant_bias        = FF_DEFAULT_QUANT_BIAS;
--    pd->ff_vcontext.inter_quant_bias        = FF_DEFAULT_QUANT_BIAS;
-     pd->ff_vcontext.noise_reduction         = 0;
-     pd->confdata.quantizer_noise_shaping = 0;
-     pd->ff_vcontext.flags                   = 0;
-@@ -1044,19 +1049,19 @@ static void tc_lavc_config_defaults(TCLa
-  */
- static void tc_lavc_dispatch_settings(TCLavcPrivateData *pd)
- {
-+    char buf[1024];
-     /* some translation... */
-     pd->ff_vcontext.bit_rate_tolerance = pd->confdata.vrate_tolerance * 1000;
-     pd->ff_vcontext.rc_min_rate = pd->confdata.rc_min_rate * 1000;
-     pd->ff_vcontext.rc_max_rate = pd->confdata.rc_max_rate * 1000;
-     pd->ff_vcontext.rc_buffer_size = pd->confdata.rc_buffer_size * 1024;
--    pd->ff_vcontext.lmin = (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5);
--    pd->ff_vcontext.lmax = (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5);
--    pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method;
-+    snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5));
-+    av_dict_set(&(pd->ff_opts), "lmin", buf, 0);
-+    snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5));
-+    av_dict_set(&(pd->ff_opts), "lmax", buf, 0);
- 
-     pd->ff_vcontext.flags = 0;
--    SET_FLAG(pd, mv0);
-     SET_FLAG(pd, qpel);
--    SET_FLAG(pd, naq);
-     SET_FLAG(pd, ilme);
-     SET_FLAG(pd, ildct);
-     SET_FLAG(pd, aic);
-@@ -1077,8 +1082,8 @@ static void tc_lavc_dispatch_settings(TC
-     }
-     if (pd->interlacing.active) {
-         /* enforce interlacing */
--        pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
--        pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
-+        pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_DCT;
-+        pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_ME;
-     }
-     if (pd->confdata.flags.alt) {
-         av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
-@@ -1095,15 +1100,31 @@ static void tc_lavc_dispatch_settings(TC
-     if (pd->confdata.flags.cbp) {
-     	av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0);
-     }
-+    if (pd->confdata.flags.mv0) {
-+    	av_dict_set(&(pd->ff_opts), "mpv_flags", "+mv0", 0);
-+    }
-+    if (pd->confdata.flags.naq) {
-+    	av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0);
-+    }
- 
--    char buf[1024];
- #define set_dict_opt(val, opt) \
-     snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
-     av_dict_set(&(pd->ff_opts), opt, buf, 0)
-+#define set_dict_float_opt(val, opt) \
-+    snprintf(buf, sizeof(buf), "%f", pd->confdata.val);\
-+    av_dict_set(&(pd->ff_opts), opt, buf, 0)
- 
-     set_dict_opt(luma_elim_threshold, "luma_elim_threshold");
-     set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold");
-     set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping");
-+    set_dict_opt(inter_quant_bias, "pbias");
-+    set_dict_opt(intra_quant_bias, "ibias");
-+    set_dict_opt(me_method, "me_method");
-+    set_dict_opt(scenechange_factor, "sc_factor");
-+    set_dict_opt(rc_strategy, "rc_strategy");
-+    set_dict_float_opt(rc_initial_cplx, "rc_init_cplx");
-+    set_dict_float_opt(rc_qsquish, "qsquish");
-+    set_dict_float_opt(border_masking, "border_mask");
- }
- 
- #undef SET_FLAG
-@@ -1159,12 +1180,12 @@ static int tc_lavc_read_config(TCLavcPri
-         { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
-         { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
-         { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
--        { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES },
-+        { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX },
-         { "vme", PAUX(me_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16, },
-         { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000 },
-         { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
-         { "sc_threshold", PCTX(scenechange_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000 },
--        { "sc_factor", PCTX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 },
-+        { "sc_factor", PAUX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 },
-         { "vb_strategy", PCTX(b_frame_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
-         { "b_sensitivity", PCTX(b_sensitivity), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 100 },
-         { "brd_scale", PCTX(brd_scale), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
-@@ -1175,7 +1196,7 @@ static int tc_lavc_read_config(TCLavcPri
-         { "vrc_maxrate", PAUX(rc_max_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 },
-         { "vrc_minrate", PAUX(rc_min_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 },
-         { "vrc_buf_size", PAUX(rc_buffer_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000 },
--        { "vrc_strategy", PCTX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 },
-+        { "vrc_strategy", PAUX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 },
-         { "vb_qfactor", PCTX(b_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 },
-         { "vi_qfactor", PCTX(i_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 },
-         { "vb_qoffset", PCTX(b_quant_offset), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0 },
-@@ -1185,9 +1206,9 @@ static int tc_lavc_read_config(TCLavcPri
-         { "mpeg_quant", PCTX(mpeg_quant), TCCONF_TYPE_FLAG, 0, 0, 1 },
-         //  { "vrc_eq",     }, // not yet supported
-         { "vrc_override", rc_override_buf, TCCONF_TYPE_STRING, 0, 0, 0 },
--        { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
-+        { "vrc_init_cplx", PAUX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
-         //  { "vrc_init_occupancy",   }, // not yet supported
--        { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
-+        { "vqsquish", PAUX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
-         { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-         { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-         { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-@@ -1199,7 +1220,7 @@ static int tc_lavc_read_config(TCLavcPri
-         { "tcplx_mask", PCTX(temporal_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
-         { "scplx_mask", PCTX(spatial_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
-         { "p_mask", PCTX(p_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
--        { "border_mask", PCTX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
-+        { "border_mask", PAUX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
-         { "pred", PCTX(prediction_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 4 },
-         { "precmp", PCTX(me_pre_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 },
-         { "cmp", PCTX(me_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 },
-@@ -1212,37 +1233,37 @@ static int tc_lavc_read_config(TCLavcPri
-         { "pre_me", PCTX(pre_me), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
-         { "subq", PCTX(me_subpel_quality), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8 },
-         { "refs", PCTX(refs), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 8 },
--        { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
--        { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
-+        { "ibias", PAUX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
-+        { "pbias", PAUX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
-         { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
-         { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
-         { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
-         { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
-     
--        { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
-+        { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 },
-         { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
--        { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
-+        { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL },
-         { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
--        { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
--        { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT },
--        { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP },
-+        { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME },
-+        { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_DCT },
-+        { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 },
-         { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-         { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC },
- #else        
--        { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED },
-+        { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED },
- #endif
-         { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 },
-         { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 },
--        { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR },
-+        { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR },
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-         { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT },
- #else
-         { "trell", PCTX(trellis), TCCONF_TYPE_FLAG, 0, 0, 1 },
- #endif
--        { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY },
--        { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV },
--        { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP },
-+        { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY },
-+        { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV },
-+        { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP },
-     
-         //  { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // not yet  supported
-         /* End of the config file */
-Index: transcode-1.1.7/export/export_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/export/export_ffmpeg.c
-+++ transcode-1.1.7/export/export_ffmpeg.c
-@@ -831,14 +831,11 @@ MOD_init
- 
-     lavc_venc_context->bit_rate           = vob->divxbitrate * 1000;
-     lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000;
--    lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
--    lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
-     lavc_venc_context->max_qdiff          = lavc_param_vqdiff;
-     lavc_venc_context->qcompress          = lavc_param_vqcompress;
-     lavc_venc_context->qblur              = lavc_param_vqblur;
-     lavc_venc_context->max_b_frames       = lavc_param_vmax_b_frames;
-     lavc_venc_context->b_quant_factor     = lavc_param_vb_qfactor;
--    lavc_venc_context->rc_strategy        = lavc_param_vrc_strategy;
-     lavc_venc_context->b_frame_strategy   = lavc_param_vb_strategy;
-     lavc_venc_context->b_quant_offset     = lavc_param_vb_qoffset;
- 
-@@ -846,8 +843,23 @@ MOD_init
- #define set_dict_opt(val, opt) \
- 	snprintf(buf, sizeof(buf), "%i", val); \
- 	av_dict_set(&lavc_venc_opts, opt, buf, 0)
-+#define set_dict_float_opt(val, opt) \
-+	snprintf(buf, sizeof(buf), "%f", val); \
-+	av_dict_set(&lavc_venc_opts, opt, buf, 0)
-     set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold");
-     set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold");
-+    set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5), "lmin");
-+    set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5), "lmax");
-+    set_dict_opt(lavc_param_vrc_strategy, "rc_strategy");
-+    set_dict_float_opt(lavc_param_rc_qsquish, "qsquish");
-+    set_dict_float_opt(lavc_param_rc_qmod_amp, "rc_qmod_amp");
-+    set_dict_opt(lavc_param_rc_qmod_freq, "rc_qmod_freq");
-+    set_dict_opt(lavc_param_rc_eq, "rc_eq");
-+    set_dict_opt(lavc_param_vme, "me_method");
-+    set_dict_opt(lavc_param_ibias, "ibias");
-+    set_dict_opt(lavc_param_pbias, "pbias");
-+    set_dict_float_opt(lavc_param_rc_buffer_aggressivity, "rc_buf_aggressivity");
-+    set_dict_float_opt(lavc_param_rc_initial_cplx, "rc_init_cplx");
-     lavc_venc_context->rtp_payload_size   = lavc_param_packet_size;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
-     if (lavc_param_packet_size)
-@@ -856,15 +868,9 @@ MOD_init
-     lavc_venc_context->strict_std_compliance= lavc_param_strict;
-     lavc_venc_context->i_quant_factor     = lavc_param_vi_qfactor;
-     lavc_venc_context->i_quant_offset     = lavc_param_vi_qoffset;
--    lavc_venc_context->rc_qsquish         = lavc_param_rc_qsquish;
--    lavc_venc_context->rc_qmod_amp        = lavc_param_rc_qmod_amp;
--    lavc_venc_context->rc_qmod_freq       = lavc_param_rc_qmod_freq;
--    lavc_venc_context->rc_eq              = lavc_param_rc_eq;
-     lavc_venc_context->rc_max_rate        = lavc_param_rc_max_rate * 1000;
-     lavc_venc_context->rc_min_rate        = lavc_param_rc_min_rate * 1000;
-     lavc_venc_context->rc_buffer_size     = lavc_param_rc_buffer_size * 1024;
--    lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity;
--    lavc_venc_context->rc_initial_cplx    = lavc_param_rc_initial_cplx;
-     lavc_venc_context->debug              = lavc_param_debug;
-     lavc_venc_context->last_predictor_count= lavc_param_last_pred;
-     lavc_venc_context->pre_me             = lavc_param_pre_me;
-@@ -872,8 +878,6 @@ MOD_init
-     lavc_venc_context->pre_dia_size       = lavc_param_pre_dia_size;
-     lavc_venc_context->me_subpel_quality  = lavc_param_me_subpel_quality;
-     lavc_venc_context->me_range           = lavc_param_me_range;
--    lavc_venc_context->intra_quant_bias   = lavc_param_ibias;
--    lavc_venc_context->inter_quant_bias   = lavc_param_pbias;
-     lavc_venc_context->coder_type         = lavc_param_coder;
-     lavc_venc_context->context_model      = lavc_param_context;
-     lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
-@@ -1079,6 +1083,8 @@ MOD_init
-     lavc_venc_context->flags |= lavc_param_mv0;
-     if(lavc_param_qp_rd)
-     	av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0);
-+    if (lavc_param_normalize_aqp)
-+    	av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0);
-     lavc_venc_context->flags |= lavc_param_ilme;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
-     lavc_venc_context->flags |= lavc_param_trell;
-@@ -1087,9 +1093,7 @@ MOD_init
- #endif
- 
-     if (lavc_param_gray)
--        lavc_venc_context->flags |= CODEC_FLAG_GRAY;
--    if (lavc_param_normalize_aqp)
--        lavc_venc_context->flags |= CODEC_FLAG_NORMALIZE_AQP;
-+        lavc_venc_context->flags |= AV_CODEC_FLAG_GRAY;
- 
-     switch(vob->encode_fields) {
-     case TC_ENCODE_FIELDS_TOP_FIRST:
-@@ -1107,9 +1111,9 @@ MOD_init
-     }
- 
-     lavc_venc_context->flags |= interlacing_active ?
--        CODEC_FLAG_INTERLACED_DCT : 0;
-+        AV_CODEC_FLAG_INTERLACED_DCT : 0;
-     lavc_venc_context->flags |= interlacing_active ?
--        CODEC_FLAG_INTERLACED_ME : 0;
-+        AV_CODEC_FLAG_INTERLACED_ME : 0;
- 
-     lavc_venc_context->flags |= lavc_param_psnr;
-     do_psnr = lavc_param_psnr;
-@@ -1156,7 +1160,7 @@ MOD_init
-                   "encoding.");
-           return TC_EXPORT_ERROR;
-         }
--        lavc_venc_context->flags |= CODEC_FLAG_PASS1;
-+        lavc_venc_context->flags |= AV_CODEC_FLAG_PASS1;
-         stats_file = fopen(vob->divxlogfile, "w");
-         if (stats_file == NULL){
-           tc_log_warn(MOD_NAME, "Could not create 2pass log file \"%s\".",
-@@ -1170,7 +1174,7 @@ MOD_init
-                   "encoding.");
-           return TC_EXPORT_ERROR;
-         }
--        lavc_venc_context->flags |= CODEC_FLAG_PASS2;
-+        lavc_venc_context->flags |= AV_CODEC_FLAG_PASS2;
-         stats_file= fopen(vob->divxlogfile, "r");
-         if (stats_file==NULL){
-           tc_log_warn(MOD_NAME, "Could not open 2pass log file \"%s\" for "
-@@ -1201,12 +1205,11 @@ MOD_init
-         break;
-       case 3:
-         /* fixed qscale :p */
--        lavc_venc_context->flags   |= CODEC_FLAG_QSCALE;
-+        lavc_venc_context->flags   |= AV_CODEC_FLAG_QSCALE;
-         lavc_venc_frame->quality  = vob->divxbitrate;
-         break;
-     }
- 
--    lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
- 
- 	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
- 	if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) {
-Index: transcode-1.1.7/export/ffmpeg_cfg.c
-===================================================================
---- transcode-1.1.7.orig/export/ffmpeg_cfg.c
-+++ transcode-1.1.7/export/ffmpeg_cfg.c
-@@ -93,8 +93,8 @@ int lavc_param_last_pred= 0;
- int lavc_param_pre_me= 1;
- int lavc_param_me_subpel_quality= 8;
- int lavc_param_me_range=0;
--int lavc_param_ibias=FF_DEFAULT_QUANT_BIAS;
--int lavc_param_pbias=FF_DEFAULT_QUANT_BIAS;
-+int lavc_param_ibias=0;
-+int lavc_param_pbias=0;
- int lavc_param_coder=0;
- int lavc_param_context=0;
- char *lavc_param_intra_matrix = NULL;
-@@ -136,7 +136,7 @@ TCConfigEntry lavcopts_conf[]={
-     {"vratetol", &lavc_param_vrate_tolerance, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000},
-     {"vhq", &lavc_param_mb_decision, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"mbd", &lavc_param_mb_decision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9},
--    {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV},
-+    {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV},
-     {"vme", &lavc_param_vme, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 5},
- //    {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
- //    {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
-@@ -147,7 +147,7 @@ TCConfigEntry lavcopts_conf[]={
-     {"vqcomp", &lavc_param_vqcompress, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0},
-     {"vqblur", &lavc_param_vqblur, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0},
-     {"vb_qfactor", &lavc_param_vb_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
--    {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES},
-+    {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX},
- //    {"vpass", &lavc_param_vpass, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2},
-     {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2},
-     {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
-@@ -158,7 +158,7 @@ TCConfigEntry lavcopts_conf[]={
-     {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
-     {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1},
- //    {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
--    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY},
-+    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY},
-     {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
-     {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
-@@ -184,7 +184,7 @@ TCConfigEntry lavcopts_conf[]={
-     {"pred", &lavc_param_prediction_method, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 20},
-     {"format", &lavc_param_format, TCCONF_TYPE_STRING, 0, 0, 0},
-     {"debug", &lavc_param_debug, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
--    {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR},
-+    {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR},
-     {"precmp", &lavc_param_me_pre_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
-     {"cmp", &lavc_param_me_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
-     {"subcmp", &lavc_param_me_sub_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
-@@ -192,9 +192,9 @@ TCConfigEntry lavcopts_conf[]={
-     {"ildctcmp", &lavc_param_ildct_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
-     {"predia", &lavc_param_pre_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000},
-     {"dia", &lavc_param_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000},
--    {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL},
-+    {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL},
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
--    {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT},
-+    {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRELLIS_QUANT},
- #else
-     {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 1},
- #endif
-@@ -203,9 +203,9 @@ TCConfigEntry lavcopts_conf[]={
-     {"subq", &lavc_param_me_subpel_quality, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8},
-     {"me_range", &lavc_param_me_range, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000},
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
--    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC},
-+    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_H263P_AIC},
- #else
--    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
-+    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED},
- #endif    
-     {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
-@@ -215,20 +215,20 @@ TCConfigEntry lavcopts_conf[]={
-     {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
-     {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
-     {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1},
--    {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
-+    {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
-     {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
-     {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1},
--    {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
-+    {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME},
-     {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
-     {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
-     {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1},
--    {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC},
--    {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRUNCATED},
--    {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP},
-+    {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1},
-+    {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRUNCATED},
-+    {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP},
-     {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16},
-     {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
-     {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
-Index: transcode-1.1.7/import/import_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/import/import_ffmpeg.c
-+++ transcode-1.1.7/import/import_ffmpeg.c
-@@ -361,7 +361,7 @@ do_avi:
-     lavc_dec_context->width  = x_dim;
-     lavc_dec_context->height = y_dim;
- 
--    if (vob->decolor) lavc_dec_context->flags |= CODEC_FLAG_GRAY;
-+    if (vob->decolor) lavc_dec_context->flags |= AV_CODEC_FLAG_GRAY;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-     lavc_dec_context->error_resilience  = 2;
- #else
diff --git a/multimedia/transcode/transcode-1.1.7-libav-10.patch b/multimedia/transcode/transcode-1.1.7-libav-10.patch
deleted file mode 100644
index 1f4a24039d7..00000000000
--- a/multimedia/transcode/transcode-1.1.7-libav-10.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-fix building w/libav-10
-
-https://wiki.libav.org/Migration/10
-
---- a/filter/filter_resample.c
-+++ b/filter/filter_resample.c
-@@ -37,6 +37,7 @@
- #include "libtc/optstr.h"
- #include "libtc/tcavcodec.h"
- #include "libtc/tcmodule-plugin.h"
-+#include 
- 
- 
- typedef struct {
-@@ -45,7 +46,7 @@ typedef struct {
- 
-     int bytes_per_sample;
- 
--    ReSampleContext *resample_ctx;
-+    AVAudioResampleContext *resample_ctx;
- } ResamplePrivateData;
- 
- static const char resample_help[] = ""
---- a/import/probe_ffmpeg.c
-+++ b/import/probe_ffmpeg.c
-@@ -51,8 +51,8 @@ static void translate_info(const AVFormatContext *ctx, ProbeInfo *info)
-             info->bitrate = st->codec->bit_rate / 1000;
-             info->width = st->codec->width;
-             info->height = st->codec->height;
--            if (st->r_frame_rate.num > 0 && st->r_frame_rate.den > 0) {
--                info->fps = av_q2d(st->r_frame_rate);
-+            if (st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0) {
-+                info->fps = av_q2d(st->avg_frame_rate);
-             } else {
-                 /* watch out here */
-                 info->fps = 1.0/av_q2d(st->codec->time_base);
diff --git a/multimedia/transcode/transcode-1.1.7-libav-9.patch b/multimedia/transcode/transcode-1.1.7-libav-9.patch
deleted file mode 100644
index 3989d3d83aa..00000000000
--- a/multimedia/transcode/transcode-1.1.7-libav-9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- import/probe_ffmpeg.c.original	2013-04-22 20:04:51.058081388 +0200
-+++ import/probe_ffmpeg.c	2013-04-22 20:05:25.744081897 +0200
-@@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe)
-         return;
-     }
- 
--    ret = av_find_stream_info(lavf_dmx_context);
-+    ret = avformat_find_stream_info(lavf_dmx_context, NULL);
-     if (ret < 0) {
-         tc_log_error(__FILE__, "unable to fetch informations from '%s'"
-                                " (libavformat failure)",
---- import/decode_lavc.c.original	2013-04-22 20:06:17.260082652 +0200
-+++ import/decode_lavc.c	2013-04-22 20:07:47.564083975 +0200
-@@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode)
- 
-   // Set these to the expected values so that ffmpeg's decoder can
-   // properly detect interlaced input.
--  lavc_dec_context = avcodec_alloc_context();
-+  lavc_dec_context = avcodec_alloc_context3(NULL);
-   if (lavc_dec_context == NULL) {
-       tc_log_error(__FILE__, "Could not allocate enough memory.");
-       goto decoder_error;
-@@ -186,7 +186,7 @@ void decode_lavc(decode_t *decode)
-   lavc_dec_context->error_concealment = 3;
-   lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
- 
--  if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) {
-+  if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) {
-       tc_log_error(__FILE__, "Could not initialize the '%s' codec.",
- 		   codec->name);
-       goto decoder_error;
diff --git a/multimedia/transcode/transcode-1.1.7-preset-force.patch b/multimedia/transcode/transcode-1.1.7-preset-force.patch
deleted file mode 100644
index 0d1da8b4f66..00000000000
--- a/multimedia/transcode/transcode-1.1.7-preset-force.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Do not force using a preset. Do not try to open non-existant preset by default.
-
-Index: transcode-1.1.7/export/export_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/export/export_ffmpeg.c
-+++ transcode-1.1.7/export/export_ffmpeg.c
-@@ -1206,7 +1206,7 @@ MOD_init
-     lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
- 
- 	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
--	if (lavc_param_video_preset) {
-+	if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) {
- 		avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
- 		video_codec_name = av_strdup(ffmpeg_codec_name(codec->name));
- 
-Index: transcode-1.1.7/export/ffmpeg_cfg.c
-===================================================================
---- transcode-1.1.7.orig/export/ffmpeg_cfg.c
-+++ transcode-1.1.7/export/ffmpeg_cfg.c
-@@ -124,7 +124,7 @@ int lavc_param_gmc = 0;
- //int lavc_param_atag = 0;
- //int lavc_param_abitrate = 224;
- 
--char *lavc_param_video_preset = "medium";
-+char *lavc_param_video_preset = "none";
- char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg";
- 
- TCConfigEntry lavcopts_conf[]={
diff --git a/multimedia/transcode/transcode-1.1.7-preset-free.patch b/multimedia/transcode/transcode-1.1.7-preset-free.patch
deleted file mode 100644
index 00494b94ba9..00000000000
--- a/multimedia/transcode/transcode-1.1.7-preset-free.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Fix invalid free when preset file not found
-https://bugs.gentoo.org/show_bug.cgi?id=322945
-Author: Brennan Shacklett
-
-diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c
---- transcode-1.1.7-orig/export/export_ffmpeg.c	2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/export/export_ffmpeg.c	2012-07-03 20:07:05.669083945 -0700
-@@ -321,7 +321,7 @@
-     }
- 
-     if(!f){
--        fprintf(stderr, "File for preset '%s' not found\n", arg);
-+        tc_log_error(MOD_NAME, "File for preset '%s' not found", arg);
-         av_exit(1);
-     }
- 
-@@ -1207,7 +1207,7 @@
- 	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
- 	if (lavc_param_video_preset) {
- 		avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
--		video_codec_name = ffmpeg_codec_name(codec->name);
-+		video_codec_name = av_strdup(ffmpeg_codec_name(codec->name));
- 
- 		const char *preset_start = lavc_param_video_preset;
- 		while (preset_start) {
-@@ -1225,6 +1225,8 @@
- 			if (opt_preset("vpre", preset_name) != 0) {
- 				tc_log_warn(MOD_NAME, "Parsing ffmpeg preset '%s' failed", preset_name);
- 			}
-+      av_free(video_codec_name);
-+      video_codec_name = NULL;
- 			if (verbose) {
- 				int i;
- 				tc_log_info(MOD_NAME, "After parsing preset '%s', %i options are overridden:", preset_name, opt_name_count);
diff --git a/multimedia/transcode/transcode.SlackBuild b/multimedia/transcode/transcode.SlackBuild
index d9a7341eb2a..7c4eff3279f 100644
--- a/multimedia/transcode/transcode.SlackBuild
+++ b/multimedia/transcode/transcode.SlackBuild
@@ -79,19 +79,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix building with newer ffmpeg
-patch -p0 -i $CWD/transcode-1.1.7-ffmpeg.patch
-patch -p0 -i $CWD/transcode-1.1.7-ffmpeg-0.10.patch
-patch -p1 -i $CWD/transcode-1.1.7-ffmpeg-0.11.patch
-patch -p1 -i $CWD/transcode-1.1.7-preset-free.patch
-patch -p0 -i $CWD/transcode-1.1.7-libav-9.patch
-patch -p1 -i $CWD/transcode-1.1.7-libav-10.patch
-patch -p1 -i $CWD/transcode-1.1.7-preset-force.patch
-patch -p1 -i $CWD/transcode-1.1.7-ffmpeg2.patch
-patch -p1 -i $CWD/transcode-1.1.7-ffmpeg24.patch
-patch -p1 -i $CWD/transcode-1.1.7-ffmpeg29.patch
-patch -p1 -i $CWD/transcode-1.1.7-ffmpeg4.patch
 # Fix building with imagemagick 7.x
+# 2024: this is actually not true anymore and imagemagick support had to be disabled, sorry folks
 patch -p1 -i $CWD/transcode-1.1.7-imagemagick7.patch
 patch -p1 -i $CWD/transcode-1.1.7-gcc10.patch
 patch -p1 -i $CWD/transcode-1.1.7-glibc-2.32.patch
@@ -100,7 +89,8 @@ autoreconf -vif
 
 export MAGICKCORE_QUANTUM_DEPTH=32
 
-CFLAGS="$SLKCFLAGS" \
+# unfortunately ffmpeg >= 5.x breaks compatibility and no patches are available...
+CFLAGS="$SLKCFLAGS -fpermissive" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -109,6 +99,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --mandir=/usr/man \
+  --disable-ffmpeg \
+  --enable-alsa \
   --enable-alsa \
   --enable-v4l \
   --enable-libv4lconvert \
@@ -131,7 +123,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-nuv \
   --enable-lzo \
   --enable-libpostproc \
-  --enable-imagemagick \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/multimedia/tvheadend/tvheadend.SlackBuild b/multimedia/tvheadend/tvheadend.SlackBuild
index fd60f657517..23df71bf9d6 100644
--- a/multimedia/tvheadend/tvheadend.SlackBuild
+++ b/multimedia/tvheadend/tvheadend.SlackBuild
@@ -108,6 +108,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-libtheora_static \
   --disable-libvorbis_static \
   --disable-libfdkaac_static \
+  --disable-libav \
   --python=python3 \
   --disable-pcloud_cache \
   --nowerror \
diff --git a/multimedia/vlc/4645.patch b/multimedia/vlc/4645.patch
new file mode 100644
index 00000000000..bd26976fbc7
--- /dev/null
+++ b/multimedia/vlc/4645.patch
@@ -0,0 +1,177 @@
+From 1e2918115ca2f5c4ffde00dc02ad89525714f6c2 Mon Sep 17 00:00:00 2001
+From: Thomas Guillem 
+Date: Tue, 5 Dec 2023 09:23:35 +0100
+Subject: [PATCH 1/5] input: fix incompatible-pointer-types assignment
+
+Fixes #28441
+---
+ src/input/input_internal.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/input/input_internal.h b/src/input/input_internal.h
+index d29731edca1b..ea02f39f5add 100644
+--- a/src/input/input_internal.h
++++ b/src/input/input_internal.h
+@@ -117,7 +117,7 @@ typedef struct input_thread_private_t
+ 
+     /* Title infos FIXME multi-input (not easy) ? */
+     int          i_title;
+-    const input_title_t **title;
++    input_title_t * const *title;
+ 
+     int i_title_offset;
+     int i_seekpoint_offset;
+-- 
+GitLab
+
+
+From adcf4e66e2ce2c382bb97957c91bfde040f4f3ca Mon Sep 17 00:00:00 2001
+From: Zhao Zhili 
+Date: Thu, 1 Mar 2018 14:25:59 +0800
+Subject: [PATCH 2/5] yadif: fix variable type
+
+Signed-off-by: Thomas Guillem 
+(cherry picked from commit 77b86f4452be4dbe0d56a9cd1b66da61b116da60)
+Signed-off-by: Thomas Guillem 
+---
+ modules/video_filter/deinterlace/yadif.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/modules/video_filter/deinterlace/yadif.h b/modules/video_filter/deinterlace/yadif.h
+index 4bc592ba9307..af16443d0804 100644
+--- a/modules/video_filter/deinterlace/yadif.h
++++ b/modules/video_filter/deinterlace/yadif.h
+@@ -140,10 +140,10 @@ static void yadif_filter_line_c(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8
+ }
+ 
+ static void yadif_filter_line_c_16bit(uint8_t *dst8, uint8_t *prev8, uint8_t *cur8, uint8_t *next8, int w, int prefs, int mrefs, int parity, int mode) {
+-    uint8_t *dst = (uint8_t *)dst8;
+-    uint8_t *prev = (uint8_t *)prev8;
+-    uint8_t *cur = (uint8_t *)cur8;
+-    uint8_t *next = (uint8_t *)next8;
++    uint16_t *dst = (uint16_t *)dst8;
++    uint16_t *prev = (uint16_t *)prev8;
++    uint16_t *cur = (uint16_t *)cur8;
++    uint16_t *next = (uint16_t *)next8;
+     int x;
+     uint16_t *prev2= parity ? prev : cur ;
+     uint16_t *next2= parity ? cur  : next;
+-- 
+GitLab
+
+
+From 45198e5328ff2b2f4eb2fb76add0789fec26270f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= 
+Date: Sun, 3 Mar 2019 09:59:10 +0200
+Subject: [PATCH 3/5] swscale: avoid invalid pointer conversion
+
+(cherry picked from commit ab00e6c59d42e05ab08893091783d8b5febc0058)
+Signed-off-by: Thomas Guillem 
+---
+ modules/video_chroma/swscale.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c
+index 8993d11ec5dd..11897527355c 100644
+--- a/modules/video_chroma/swscale.c
++++ b/modules/video_chroma/swscale.c
+@@ -588,8 +588,9 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx,
+ {
+     filter_sys_t *p_sys = p_filter->p_sys;
+     uint8_t palette[AVPALETTE_SIZE];
+-    uint8_t *src[4]; int src_stride[4];
+-    uint8_t *dst[4]; int dst_stride[4];
++    uint8_t *src[4], *dst[4];
++    const uint8_t *csrc[4];
++    int src_stride[4], dst_stride[4];
+ 
+     GetPixels( src, src_stride, p_sys->desc_in, &p_filter->fmt_in.video,
+                p_src, i_plane_count, b_swap_uvi );
+@@ -606,11 +607,14 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx,
+     GetPixels( dst, dst_stride, p_sys->desc_out, &p_filter->fmt_out.video,
+                p_dst, i_plane_count, b_swap_uvo );
+ 
++    for (size_t i = 0; i < ARRAY_SIZE(src); i++)
++        csrc[i] = src[i];
++
+ #if LIBSWSCALE_VERSION_INT  >= ((0<<16)+(5<<8)+0)
+-    sws_scale( ctx, src, src_stride, 0, i_height,
++    sws_scale( ctx, csrc, src_stride, 0, i_height,
+                dst, dst_stride );
+ #else
+-    sws_scale_ordered( ctx, src, src_stride, 0, i_height,
++    sws_scale_ordered( ctx, csrc, src_stride, 0, i_height,
+                        dst, dst_stride );
+ #endif
+ }
+-- 
+GitLab
+
+
+From 4431076ad4a21fdcabd3f7ef1d61c45891689b0c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= 
+Date: Sun, 3 Mar 2019 17:20:04 +0200
+Subject: [PATCH 4/5] dynamicoverlay: fix variable shadowing
+
+(cherry picked from commit d42e05d6b2c061ae352c131d5aebf8c8d8aa6d35)
+Signed-off-by: Thomas Guillem 
+---
+ modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
+index a93462925e8a..a85f9aafb0b9 100644
+--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
++++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
+@@ -899,12 +899,11 @@ static const commanddesc_static_t p_commands[] =
+ void RegisterCommand( filter_t *p_filter )
+ {
+     filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys;
+-    size_t i_index = 0;
+ 
+     p_sys->i_commands = ARRAY_SIZE(p_commands);
+     p_sys->pp_commands = (commanddesc_t **) calloc( p_sys->i_commands, sizeof(commanddesc_t*) );
+     if( !p_sys->pp_commands ) return;
+-    for( i_index = 0; i_index < p_sys->i_commands; i_index ++ )
++    for( size_t i_index = 0; i_index < p_sys->i_commands; i_index ++ )
+     {
+         p_sys->pp_commands[i_index] = (commanddesc_t *) malloc( sizeof(commanddesc_t) );
+         if( !p_sys->pp_commands[i_index] ) return;
+-- 
+GitLab
+
+
+From fda14fc7c013eb75291df10cc8b88336c51328ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= 
+Date: Mon, 26 Feb 2018 20:43:03 +0200
+Subject: [PATCH 5/5] dynamicoverlay: fix memory corruption
+
+Font alpha is 8-bits, not 32-bits.
+
+(cherry picked from commit 6f14081af7325d334a53126c4eea52bc30fc08a0)
+Signed-off-by: Thomas Guillem 
+---
+ modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
+index a85f9aafb0b9..7a71c6f2373a 100644
+--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
++++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
+@@ -234,8 +234,12 @@ static int parser_SetTextAlpha( char *psz_command, char *psz_end,
+     skip_space( &psz_command );
+     if( isdigit( (unsigned char)*psz_command ) )
+     {
+-        if( parse_digit( &psz_command, &p_params->fontstyle.i_font_alpha ) == VLC_EGENERIC )
++        int32_t value;
++
++        if( parse_digit( &psz_command, &value ) == VLC_EGENERIC )
+             return VLC_EGENERIC;
++
++        p_params->fontstyle.i_font_alpha = value;
+     }
+     return VLC_SUCCESS;
+ }
+-- 
+GitLab
+
diff --git a/multimedia/vlc/4665.patch b/multimedia/vlc/4665.patch
new file mode 100644
index 00000000000..47e5847d054
--- /dev/null
+++ b/multimedia/vlc/4665.patch
@@ -0,0 +1,375 @@
+From 770789f265761fc7ab2de69ca105fec4ad93d9e2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= 
+Date: Mon, 26 Feb 2018 20:36:29 +0200
+Subject: [PATCH 1/9] chromaprint: missing cast
+
+(cherry picked from commit 7bd5bab3e43ae187f7219db61ed85d06d2ba0547)
+Signed-off-by: Steve Lhomme 
+---
+ modules/stream_out/chromaprint.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/stream_out/chromaprint.c b/modules/stream_out/chromaprint.c
+index 80ec31ba2590..c76cbda3c2bb 100644
+--- a/modules/stream_out/chromaprint.c
++++ b/modules/stream_out/chromaprint.c
+@@ -231,7 +231,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
+         if ( !p_sys->b_finished && id->i_samples > 0 && p_buf->i_buffer )
+         {
+             if(! chromaprint_feed( p_sys->p_chromaprint_ctx,
+-                                   p_buf->p_buffer,
++                                   (int16_t *)p_buf->p_buffer,
+                                    p_buf->i_buffer / BYTESPERSAMPLE ) )
+                 msg_Warn( p_stream, "feed error" );
+             id->i_samples -= i_samples;
+-- 
+GitLab
+
+
+From 6179d6b843f2a93af6a3d51c4244766e3eba9e77 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= 
+Date: Sun, 14 Apr 2019 09:41:38 +0300
+Subject: [PATCH 2/9] win32: wrap {g,s}etsockopt()
+
+char * can alias anything, and Winsock relies on that. Unfortunately,
+the compiler still issues warnings. This works around that.
+
+(cherry picked from commit 36715d9b79f34824e126c2bc3aee2f1c1c16af46)
+Signed-off-by: Steve Lhomme 
+---
+ include/vlc_network.h | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/include/vlc_network.h b/include/vlc_network.h
+index 010454a01c09..e39ffd0bacaa 100644
+--- a/include/vlc_network.h
++++ b/include/vlc_network.h
+@@ -183,6 +183,22 @@ VLC_API int vlc_close(int);
+ 
+ /** @} */
+ 
++#ifdef _WIN32
++static inline int vlc_getsockopt(int s, int level, int name,
++                                 void *val, socklen_t *len)
++{
++    return getsockopt(s, level, name, (char *)val, len);
++}
++#define getsockopt vlc_getsockopt
++
++static inline int vlc_setsockopt(int s, int level, int name,
++                                 const void *val, socklen_t len)
++{
++    return setsockopt(s, level, name, (const char *)val, len);
++}
++#define setsockopt vlc_setsockopt
++#endif
++
+ /* Portable network names/addresses resolution layer */
+ 
+ #define NI_MAXNUMERICHOST 64
+-- 
+GitLab
+
+
+From 3391108f9709f0d77d9297c94371cf9cd30f2cbe Mon Sep 17 00:00:00 2001
+From: Steve Lhomme 
+Date: Thu, 7 Dec 2023 15:43:04 +0100
+Subject: [PATCH 3/9] netsync: use char for temporary local buffer
+
+On Windows recvfrom/revc/sendto expects a char*.
+---
+ modules/control/netsync.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/modules/control/netsync.c b/modules/control/netsync.c
+index 2a6a1a6a2bf8..8c91034d7cf2 100644
+--- a/modules/control/netsync.c
++++ b/modules/control/netsync.c
+@@ -181,7 +181,7 @@ static void *Master(void *handle)
+     intf_sys_t *sys = intf->p_sys;
+     for (;;) {
+         struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, };
+-        uint64_t data[2];
++        char data[16];
+ 
+         if (poll(&ufd, 1, -1) < 0)
+             continue;
+@@ -198,8 +198,8 @@ static void *Master(void *handle)
+         if (master_system < 0)
+             continue;
+ 
+-        data[0] = hton64(mdate());
+-        data[1] = hton64(master_system);
++        SetQWBE(&data[0], mdate());
++        SetQWBE(&data[8], master_system);
+ 
+         /* Reply to the sender */
+         sendto(sys->fd, data, 16, 0,
+@@ -224,7 +224,7 @@ static void *Slave(void *handle)
+ 
+     for (;;) {
+         struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, };
+-        uint64_t data[2];
++        char data[16];
+ 
+         vlc_tick_t system = GetPcrSystem(sys->input);
+         if (system < 0)
+@@ -233,7 +233,7 @@ static void *Slave(void *handle)
+         /* Send clock request to the master */
+         const vlc_tick_t send_date = mdate();
+ 
+-        data[0] = hton64(system);
++        SetQWBE(&data[0], system);
+         send(sys->fd, data, 8, 0);
+ 
+         /* Don't block */
+@@ -244,8 +244,8 @@ static void *Slave(void *handle)
+         if (recv(sys->fd, data, 16, 0) < 16)
+             goto wait;
+ 
+-        const vlc_tick_t master_date   = ntoh64(data[0]);
+-        const vlc_tick_t master_system = ntoh64(data[1]);
++        const vlc_tick_t master_date   = GetQWBE(&data[0]);
++        const vlc_tick_t master_system = GetQWBE(&data[8]);
+         const vlc_tick_t diff_date = receive_date -
+                                   ((receive_date - send_date) / 2 + master_date);
+ 
+-- 
+GitLab
+
+
+From 27e584d7b9add8dbbb82b7227228e1ec1e25a089 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme 
+Date: Tue, 3 Jan 2023 13:23:00 +0100
+Subject: [PATCH 4/9] access/dtv: move the lfind() Windows hack in the module
+
+So that we don't have to include search.h each time vlc_fixups.h is used.
+
+The Win32 prototype of lfind() expects an unsigned* for 'nelp', not a size_t*.
+
+(cherry picked from commit 7c43bcba27b6fe256456d93a9d32e10648f08da8)
+Signed-off-by: Steve Lhomme 
+---
+ include/vlc_fixups.h        | 3 +++
+ modules/access/dtv/access.c | 5 +++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
+index 37f788933779..861cb4cc5063 100644
+--- a/include/vlc_fixups.h
++++ b/include/vlc_fixups.h
+@@ -501,8 +501,11 @@ void *tsearch( const void *key, void **rootp, int(*cmp)(const void *, const void
+ void *tfind( const void *key, const void **rootp, int(*cmp)(const void *, const void *) );
+ void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void *) );
+ void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) );
++#ifndef _WIN32
++/* the Win32 prototype of lfind() expects an unsigned* for 'nmemb' */
+ void *lfind( const void *key, const void *base, size_t *nmemb,
+              size_t size, int(*cmp)(const void *, const void *) );
++#endif
+ #endif /* HAVE_SEARCH_H */
+ #ifndef HAVE_TDESTROY
+ void tdestroy( void *root, void (*free_node)(void *nodep) );
+diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c
+index d9756c7b4885..c6ca5005883c 100644
+--- a/modules/access/dtv/access.c
++++ b/modules/access/dtv/access.c
+@@ -32,6 +32,11 @@
+ #ifdef HAVE_SEARCH_H
+ #include 
+ #endif
++#if defined(_WIN32)
++/* the Win32 prototype of lfind() expects an unsigned* for 'nelp' */
++# define lfind(a,b,c,d,e) \
++         lfind((a),(b), &(unsigned){ (*(c) > UINT_MAX) ? UINT_MAX : *(c) }, (d),(e))
++#endif
+ 
+ #include "dtv/dtv.h"
+ 
+-- 
+GitLab
+
+
+From 5a9ca37a95b6e85e6beaaefba9aa4a886a45411c Mon Sep 17 00:00:00 2001
+From: Steve Lhomme 
+Date: Mon, 15 Jul 2019 12:41:29 +0200
+Subject: [PATCH 5/9] vlc_common: fix swab() calls on win32 that don't use
+ const on source pointer
+
+(cherry picked from commit a9e0b1124e19225b903a2926951781e84002c410)
+Signed-off-by: Steve Lhomme 
+---
+ include/vlc_common.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/include/vlc_common.h b/include/vlc_common.h
+index 8090b277150d..089878581763 100644
+--- a/include/vlc_common.h
++++ b/include/vlc_common.h
+@@ -947,6 +947,11 @@ static inline void SetQWLE (void *p, uint64_t qw)
+ #       define O_NONBLOCK 0
+ #   endif
+ 
++/* the mingw32 swab() and win32 _swab() prototypes expect a char* instead of a
++   const void* */
++#  define swab(a,b,c)  swab((char*) (a), (char*) (b), (c))
++
++
+ #   include 
+ #endif /* _WIN32 */
+ 
+-- 
+GitLab
+
+
+From b758e19479a80604e3feb470b197e4a13a203a85 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme 
+Date: Wed, 10 Jul 2019 08:23:45 +0200
+Subject: [PATCH 6/9] avcodec: encoder: fix MPEG4 matrix passed as const
+
+lavc expects a pointer that it will free in avcodec_free_context().
+
+(cherry picked from commit d86c4c87aa78130a4fd00294e25df865d0e2b327)
+Signed-off-by: Steve Lhomme 
+---
+ modules/codec/avcodec/encoder.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
+index 2b1c3604713d..4919ccf0e0e4 100644
+--- a/modules/codec/avcodec/encoder.c
++++ b/modules/codec/avcodec/encoder.c
+@@ -588,8 +588,14 @@ int InitVideoEnc( vlc_object_t *p_this )
+ 
+         if ( p_sys->b_mpeg4_matrix )
+         {
+-            p_context->intra_matrix = mpeg4_default_intra_matrix;
+-            p_context->inter_matrix = mpeg4_default_non_intra_matrix;
++            p_context->intra_matrix = av_malloc( sizeof(mpeg4_default_intra_matrix) );
++            if ( p_context->intra_matrix )
++                memcpy( p_context->intra_matrix, mpeg4_default_intra_matrix,
++                        sizeof(mpeg4_default_intra_matrix));
++            p_context->inter_matrix = av_malloc( sizeof(mpeg4_default_non_intra_matrix) );
++            if ( p_context->inter_matrix )
++                memcpy( p_context->inter_matrix, mpeg4_default_non_intra_matrix,
++                        sizeof(mpeg4_default_non_intra_matrix));
+         }
+ 
+         if ( p_sys->b_pre_me )
+-- 
+GitLab
+
+
+From 55be3ce60795a09d13861c5637c1fe7aebc5ce8b Mon Sep 17 00:00:00 2001
+From: Steve Lhomme 
+Date: Thu, 7 Dec 2023 14:18:22 +0100
+Subject: [PATCH 7/9] smb: fix potential string to wide string copy
+
+The type of net_resource depends on the UNICODE define.
+---
+ modules/access/smb.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules/access/smb.c b/modules/access/smb.c
+index 5fe56f0c9dfe..6add2a3e6278 100644
+--- a/modules/access/smb.c
++++ b/modules/access/smb.c
+@@ -524,7 +524,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server,
+                                 const char *psz_pwd, const char *psz_domain )
+ {
+     char psz_remote[MAX_PATH];
+-    NETRESOURCE net_resource;
++    NETRESOURCEA net_resource;
+     DWORD i_result;
+     VLC_UNUSED( psz_domain );
+ 
+@@ -544,7 +544,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server,
+ 
+     net_resource.lpRemoteName = psz_remote;
+ 
+-    i_result = WNetAddConnection2( &net_resource, psz_pwd, psz_user, 0 );
++    i_result = WNetAddConnection2A( &net_resource, psz_pwd, psz_user, 0 );
+ 
+     if( i_result != NO_ERROR )
+     {
+-- 
+GitLab
+
+
+From 5ae924bf212dce64a6424561d92426dbcc2cf3a0 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme 
+Date: Wed, 6 Dec 2023 14:45:46 +0100
+Subject: [PATCH 8/9] dxva2: add missing mask initializers
+
+---
+ modules/codec/avcodec/dxva2.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
+index 18b872fe0fe3..2e6809a05410 100644
+--- a/modules/codec/avcodec/dxva2.c
++++ b/modules/codec/avcodec/dxva2.c
+@@ -84,12 +84,12 @@ DEFINE_GUID(DXVA_Intel_H264_NoFGT_ClearVideo,       0x604F8E68, 0x4951, 0x4c54,
+ 
+ /* XXX Preferred format must come first */
+ static const d3d9_format_t d3d_formats[] = {
+-    { "YV12",   MAKEFOURCC('Y','V','1','2'),    VLC_CODEC_YV12 },
+-    { "NV12",   MAKEFOURCC('N','V','1','2'),    VLC_CODEC_NV12 },
+-    //{ "IMC3",   MAKEFOURCC('I','M','C','3'),    VLC_CODEC_YV12 },
+-    { "P010",   MAKEFOURCC('P','0','1','0'),    VLC_CODEC_P010 },
++    { "YV12",   MAKEFOURCC('Y','V','1','2'),    VLC_CODEC_YV12, 0,0,0 },
++    { "NV12",   MAKEFOURCC('N','V','1','2'),    VLC_CODEC_NV12, 0,0,0 },
++    //{ "IMC3",   MAKEFOURCC('I','M','C','3'),    VLC_CODEC_YV12, 0,0,0 },
++    { "P010",   MAKEFOURCC('P','0','1','0'),    VLC_CODEC_P010, 0,0,0 },
+ 
+-    { NULL, 0, 0 }
++    { NULL, 0, 0, 0,0,0 }
+ };
+ 
+ static const d3d9_format_t *D3dFindFormat(D3DFORMAT format)
+-- 
+GitLab
+
+
+From 08c7a66780740679ba1b0abe9e30e73afc6bc271 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme 
+Date: Wed, 6 Dec 2023 07:48:29 +0100
+Subject: [PATCH 9/9] win32/modules: use cast with GetProcAddress function
+ pointers
+
+---
+ src/text/url.c     | 3 ++-
+ src/win32/plugin.c | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/text/url.c b/src/text/url.c
+index b962eb31f849..2eb4b8d10817 100644
+--- a/src/text/url.c
++++ b/src/text/url.c
+@@ -892,7 +892,8 @@ static int IdnToAscii(DWORD flags, LPCWSTR str, int len, LPWSTR buf, int size)
+     int (WINAPI *IdnToAsciiReal)(DWORD, LPCWSTR, int, LPWSTR, int);
+     int ret = 0;
+ 
+-    IdnToAsciiReal = GetProcAddress(h, "IdnToAscii");
++    IdnToAsciiReal = (int (WINAPI *)(DWORD, LPCWSTR, int, LPWSTR, int))
++                     GetProcAddress(h, "IdnToAscii");
+     if (IdnToAsciiReal != NULL)
+         ret = IdnToAsciiReal(flags, str, len, buf, size);
+     else
+diff --git a/src/win32/plugin.c b/src/win32/plugin.c
+index 1a65521fca75..b5c336eb99ca 100644
+--- a/src/win32/plugin.c
++++ b/src/win32/plugin.c
+@@ -45,7 +45,8 @@ static BOOL WINAPI SetThreadErrorModeFallback(DWORD mode, DWORD *oldmode)
+ 
+     BOOL (WINAPI *SetThreadErrorModeReal)(DWORD, DWORD *);
+ 
+-    SetThreadErrorModeReal = GetProcAddress(h, "SetThreadErrorMode");
++    SetThreadErrorModeReal = (BOOL (WINAPI *)(DWORD, DWORD *))
++                              GetProcAddress(h, "SetThreadErrorMode");
+     if (SetThreadErrorModeReal != NULL)
+         return SetThreadErrorModeReal(mode, oldmode);
+ 
+-- 
+GitLab
+
diff --git a/multimedia/vlc/vlc-3.0.21-fedora_ffmpeg7-1.patch b/multimedia/vlc/vlc-3.0.21-fedora_ffmpeg7-1.patch
new file mode 100644
index 00000000000..d6df9831ddc
--- /dev/null
+++ b/multimedia/vlc/vlc-3.0.21-fedora_ffmpeg7-1.patch
@@ -0,0 +1,1139 @@
+Submitted By:            Bruce Dubbs 
+Date:                    2024-05-27
+Initial Package Version: 3.0.20
+Upstream Status:         Unknown
+Origin:                  Fedora
+Description:             Fixes compilation with ffmpeg-7
+
+From 965ad6ca875fea94712b4e8b107d0100937dcd4f Mon Sep 17 00:00:00 2001
+From: Steve Lhomme 
+Date: Fri, 3 Aug 2018 10:59:16 +0200
+Subject: [PATCH] avcodec: remove libavutils checks that are always true based
+ on configure checks
+
+We assume we use 55.9.0 and 55.22.101
+---
+ modules/codec/avcodec/avcommon_compat.h |  4 ----
+ modules/codec/avcodec/chroma.c          |  6 ------
+ modules/codec/avcodec/encoder.c         |  6 +-----
+ modules/codec/avcodec/va.c              |  5 +----
+ modules/codec/avcodec/video.c           | 12 ++----------
+ 5 files changed, 4 insertions(+), 29 deletions(-)
+
+diff --git a/modules/codec/avcodec/avcommon_compat.h b/modules/codec/avcodec/avcommon_compat.h
+index 8f9c12081cf8..afd5cc476f8f 100644
+--- a/modules/codec/avcodec/avcommon_compat.h
++++ b/modules/codec/avcodec/avcommon_compat.h
+@@ -91,10 +91,6 @@
+     ( (LIBAVUTIL_VERSION_MICRO <  100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \
+       (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) )
+ 
+-#if !LIBAVUTIL_VERSION_CHECK( 52, 11, 0, 32, 100 )
+-#   define AV_PIX_FMT_FLAG_HWACCEL  PIX_FMT_HWACCEL
+-#endif
+-
+ /*
+  * AV_PIX_FMT_VAAPI is not introduced in the same major version in libav and FFmpeg:
+  *  - libav:  lavu 55.8.0:    libav/d264c720f7b74286840719e506daba39f83b438b
+diff --git a/modules/codec/avcodec/chroma.c b/modules/codec/avcodec/chroma.c
+index cd8d714bf295..454a20381e41 100644
+--- a/modules/codec/avcodec/chroma.c
++++ b/modules/codec/avcodec/chroma.c
+@@ -145,13 +145,11 @@ static const struct
+     VLC_RGB( VLC_CODEC_RGB32, AV_PIX_FMT_0BGR32, AV_PIX_FMT_0RGB32, 0x000000ff, 0x0000ff00, 0x00ff0000 )
+ #endif
+ 
+-#if (LIBAVUTIL_VERSION_MICRO == 0 || LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 55, 0, 100 ) )
+ #ifdef WORDS_BIGENDIAN
+     {VLC_CODEC_RGBA64, AV_PIX_FMT_RGBA64BE, 0, 0, 0 },
+ #else /* !WORDS_BIGENDIAN */
+     {VLC_CODEC_RGBA64, AV_PIX_FMT_RGBA64LE, 0, 0, 0 },
+ #endif /* !WORDS_BIGENDIAN */
+-#endif
+ 
+     {VLC_CODEC_RGBA, AV_PIX_FMT_RGBA, 0, 0, 0 },
+     {VLC_CODEC_ARGB, AV_PIX_FMT_ARGB, 0, 0, 0 },
+@@ -180,9 +178,7 @@ static const struct
+     {VLC_CODEC_GBR_PLANAR_16B, AV_PIX_FMT_GBRP16BE, 0, 0, 0 },
+ 
+     /* XYZ */
+-#if LIBAVUTIL_VERSION_CHECK(52, 10, 0, 25, 100)
+     {VLC_CODEC_XYZ12, AV_PIX_FMT_XYZ12, 0xfff0, 0xfff0, 0xfff0},
+-#endif
+     { 0, 0, 0, 0, 0 }
+ };
+ 
+diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
+index a00439e93965..cbe150c7016f 100644
+--- a/modules/codec/avcodec/encoder.c
++++ b/modules/codec/avcodec/encoder.c
+@@ -48,9 +48,7 @@
+ #include "avcodec.h"
+ #include "avcommon.h"
+ 
+-#if LIBAVUTIL_VERSION_CHECK( 52,2,6,0,0 )
+-# include 
+-#endif
++#include 
+ 
+ #define HURRY_UP_GUARD1 (450000)
+ #define HURRY_UP_GUARD2 (300000)
+@@ -740,7 +738,6 @@ int InitVideoEnc( vlc_object_t *p_this )
+         p_context->time_base.num = 1;
+         p_context->time_base.den = p_context->sample_rate;
+         p_context->channels      = p_enc->fmt_out.audio.i_channels;
+-#if LIBAVUTIL_VERSION_CHECK( 52, 2, 6, 0, 0)
+         p_context->channel_layout = channel_mask[p_context->channels][1];
+ 
+         /* Setup Channel ordering for multichannel audio
+@@ -790,7 +787,6 @@ int InitVideoEnc( vlc_object_t *p_this )
+         p_sys->i_channels_to_reorder =
+             aout_CheckChannelReorder( NULL, pi_order_dst, order_mask,
+                                       p_sys->pi_reorder_layout );
+-#endif
+ 
+         if ( p_enc->fmt_out.i_codec == VLC_CODEC_MP4A )
+         {
+diff --git a/modules/codec/avcodec/va.c b/modules/codec/avcodec/va.c
+index d1e3048259be..ecf4e8aa14a1 100644
+--- a/modules/codec/avcodec/va.c
++++ b/modules/codec/avcodec/va.c
+@@ -58,7 +58,6 @@ vlc_fourcc_t vlc_va_GetChroma(enum Pixel
+             }
+             break;
+ 
+-#if LIBAVUTIL_VERSION_CHECK(54, 13, 1, 24, 100)
+         case AV_PIX_FMT_D3D11VA_VLD:
+             switch (swfmt)
+             {
+@@ -68,8 +67,7 @@ vlc_fourcc_t vlc_va_GetChroma(enum Pixel
+                     return VLC_CODEC_D3D11_OPAQUE;
+             }
+         break;
+-#endif
+-#if (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52, 4, 0))
++
+         case AV_PIX_FMT_VDPAU:
+             switch (swfmt)
+             {
+@@ -86,7 +84,6 @@ vlc_fourcc_t vlc_va_GetChroma(enum Pixel
+                     return 0;
+             }
+             break;
+-#endif
+         default:
+             return 0;
+     }
+diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
+index a9d45ba4abe1..3c2b3adb2663 100644
+--- a/modules/codec/avcodec/video.c
++++ b/modules/codec/avcodec/video.c
+@@ -39,7 +39,7 @@
+ #include 
+ #include 
+ #include 
+-#if (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 55, 16, 101 ) )
++#if (LIBAVUTIL_VERSION_MICRO >= 100)
+ #include 
+ #endif
+ 
+@@ -687,15 +687,11 @@ static int ffmpeg_OpenVa(decoder_t *p_de
+ static const enum PixelFormat hwfmts[] =
+ {
+ #ifdef _WIN32
+-#if LIBAVUTIL_VERSION_CHECK(54, 13, 1, 24, 100)
+     AV_PIX_FMT_D3D11VA_VLD,
+-#endif
+     AV_PIX_FMT_DXVA2_VLD,
+ #endif
+     AV_PIX_FMT_VAAPI,
+-#if (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52, 4, 0))
+     AV_PIX_FMT_VDPAU,
+-#endif
+     AV_PIX_FMT_NONE,
+ };
+ 
+@@ -995,7 +991,7 @@ static int DecodeSidedata( decoder_t *p_
+     decoder_sys_t *p_sys = p_dec->p_sys;
+     bool format_changed = false;
+ 
+-#if (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 55, 16, 101 ) )
++#if (LIBAVUTIL_VERSION_MICRO >= 100)
+ #define FROM_AVRAT(default_factor, avrat) \
+ (uint64_t)(default_factor) * (avrat).num / (avrat).den
+     const AVFrameSideData *metadata =
+-- 
+GitLab
+
+
+From 16fd46fa506424134beb53ec88be3eea1b42a221 Mon Sep 17 00:00:00 2001
+From: Ilkka Ollakka 
+Date: Wed, 7 Jul 2021 12:37:58 +0000
+Subject: [PATCH] avcodec: remove use of av_init_packet as it is deprecated in
+ new ffmpeg major version
+
+av_init_packet is deprecated in new major version of ffmpeg.
+
+Also use av_packet_free instead of unref.
+
+Use av_packet_clone and AVPacket * in vlc_av_packet_t.
+---
+ modules/codec/avcodec/subtitle.c | 4 ----
+ 5 files changed, 0 insertions(+), 4 deletions(-)
+
+
+diff --git a/modules/codec/avcodec/subtitle.c b/modules/codec/avcodec/subtitle.c
+index a92522e4ed00..4cb920a8f444 100644
+--- a/modules/codec/avcodec/subtitle.c
++++ b/modules/codec/avcodec/subtitle.c
+@@ -90,11 +90,7 @@ int InitSubtitleDec(vlc_object_t *obj)
+     context->extradata_size = 0;
+     context->extradata = NULL;
+ 
+-#if LIBAVFORMAT_VERSION_MAJOR >= 59
+     context->pkt_timebase=AV_TIME_BASE_Q;
+-#elif LIBAVFORMAT_VERSION_MICRO >= 100
+-    av_codec_set_pkt_timebase(context, AV_TIME_BASE_Q);
+-#endif
+ 
+     /* */
+     int ret;
+-- 
+GitLab
+
+
+From 18e98b8a0c410be5e1e9eac55052fe0c56901759 Mon Sep 17 00:00:00 2001
+From: Marvin Scholz 
+Date: Tue, 30 Nov 2021 18:20:39 +0100
+Subject: [PATCH] avcommon: remove libav from version check macros
+
+---
+ modules/codec/avcodec/avcommon_compat.h | 29 ++++++++++++-------------
+ modules/codec/avcodec/fourcc.c          |  4 ++--
+ modules/codec/avcodec/video.c           |  4 ++--
+ modules/demux/avformat/mux.c            | 10 ++++-----
+ 5 files changed, 23 insertions(+), 24 deletions(-)
+
+diff --git a/modules/codec/avcodec/avcommon_compat.h b/modules/codec/avcodec/avcommon_compat.h
+index 90de502d99ce..010b570e0820 100644
+--- a/modules/codec/avcodec/avcommon_compat.h
++++ b/modules/codec/avcodec/avcommon_compat.h
+@@ -30,13 +30,13 @@
+ #ifdef HAVE_LIBAVCODEC_AVCODEC_H
+ #include 
+ 
+-/* LIBAVCODEC_VERSION_CHECK checks for the right version of libav and FFmpeg
++/* LIBAVCODEC_VERSION_CHECK checks for the right version of FFmpeg
+  * a is the major version
+- * b and c the minor and micro versions of libav
+- * d and e the minor and micro versions of FFmpeg */
+-#define LIBAVCODEC_VERSION_CHECK( a, b, c, d, e ) \
+-    ( (LIBAVCODEC_VERSION_MICRO <  100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \
+-      (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) )
++ * b is the minor version
++ * c is the micro version
++ */
++#define LIBAVCODEC_VERSION_CHECK( a, b, c ) \
++    (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, b, c ) )
+ 
+ #ifndef AV_CODEC_FLAG_OUTPUT_CORRUPT
+ # define AV_CODEC_FLAG_OUTPUT_CORRUPT CODEC_FLAG_OUTPUT_CORRUPT
+@@ -83,13 +83,13 @@
+ #ifdef HAVE_LIBAVUTIL_AVUTIL_H
+ # include 
+ 
+-/* LIBAVUTIL_VERSION_CHECK checks for the right version of libav and FFmpeg
++/* LIBAVUTIL_VERSION_CHECK checks for the right version of FFmpeg
+  * a is the major version
+- * b and c the minor and micro versions of libav
+- * d and e the minor and micro versions of FFmpeg */
+-#define LIBAVUTIL_VERSION_CHECK( a, b, c, d, e ) \
+-    ( (LIBAVUTIL_VERSION_MICRO <  100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \
+-      (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) )
++ * b is the minor version
++ * c is the micro version
++ */
++#define LIBAVUTIL_VERSION_CHECK( a, b, c ) \
++    (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( a, b, c ) )
+ 
+ /*
+  * AV_PIX_FMT_VAAPI is not introduced in the same major version in libav and FFmpeg:
+@@ -115,9 +115,8 @@
+ #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
+ # include 
+ 
+-#define LIBAVFORMAT_VERSION_CHECK( a, b, c, d, e ) \
+-    ( (LIBAVFORMAT_VERSION_MICRO <  100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT( a, b, c ) ) || \
+-      (LIBAVFORMAT_VERSION_MICRO >= 100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT( a, d, e ) ) )
++#define LIBAVFORMAT_VERSION_CHECK( a, b, c ) \
++    (LIBAVFORMAT_VERSION_MICRO >= 100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT( a, b, c ) )
+ 
+ #endif
+ 
+diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
+index de41991ebb51..edab2cbdca8f 100644
+--- a/modules/codec/avcodec/fourcc.c
++++ b/modules/codec/avcodec/fourcc.c
+@@ -226,7 +226,7 @@ static const struct vlc_avcodec_fourcc v
+     { VLC_CODEC_CLLC, AV_CODEC_ID_CLLC },
+     { VLC_CODEC_MSS2, AV_CODEC_ID_MSS2 },
+     { VLC_CODEC_VP9, AV_CODEC_ID_VP9 },
+-#if LIBAVCODEC_VERSION_CHECK( 57, 26, 0, 83, 101 )
++#if LIBAVCODEC_VERSION_CHECK( 57, 83, 101 )
+     { VLC_CODEC_AV1, AV_CODEC_ID_AV1 },
+ #endif
+     { VLC_CODEC_ICOD, AV_CODEC_ID_AIC },
+@@ -281,19 +281,19 @@ static const struct vlc_avcodec_fourcc v
+     /* ffmpeg only: AV_CODEC_ID_SNOW */
+     /* ffmpeg only: AV_CODEC_ID_SMVJPEG */
+ 
+-#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 24, 102 )
++#if LIBAVCODEC_VERSION_CHECK( 57, 24, 102 )
+     { VLC_CODEC_CINEFORM, AV_CODEC_ID_CFHD },
+ #endif
+ 
+-#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 70, 100 )
++#if LIBAVCODEC_VERSION_CHECK( 57, 70, 100 )
+     { VLC_CODEC_PIXLET, AV_CODEC_ID_PIXLET },
+ #endif
+ 
+-#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 71, 101 )
++#if LIBAVCODEC_VERSION_CHECK( 57, 71, 101 )
+     { VLC_CODEC_SPEEDHQ, AV_CODEC_ID_SPEEDHQ },
+ #endif
+ 
+-#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 79, 100 )
++#if LIBAVCODEC_VERSION_CHECK( 57, 79, 100 )
+     { VLC_CODEC_FMVC, AV_CODEC_ID_FMVC },
+ #endif
+ };
+@@ -410,7 +410,7 @@ static const struct vlc_avcodec_fourcc a
+     /* AV_CODEC_ID_WESTWOOD_SND1 */
+     { VLC_CODEC_GSM, AV_CODEC_ID_GSM },
+     { VLC_CODEC_QDM2, AV_CODEC_ID_QDM2 },
+-#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 71, 100 )
++#if LIBAVCODEC_VERSION_CHECK( 57, 71, 100 )
+     { VLC_CODEC_QDMC, AV_CODEC_ID_QDMC },
+ #endif
+     { VLC_CODEC_COOK, AV_CODEC_ID_COOK },
+@@ -478,7 +478,7 @@ static const struct vlc_avcodec_fourcc s
+     { VLC_CODEC_SSA, AV_CODEC_ID_SSA },
+     /* AV_CODEC_ID_MOV_TEXT */
+     { VLC_CODEC_BD_PG, AV_CODEC_ID_HDMV_PGS_SUBTITLE },
+-#if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 71, 100 )
++#if LIBAVCODEC_VERSION_CHECK( 57, 71, 100 )
+     { VLC_CODEC_BD_TEXT, AV_CODEC_ID_HDMV_TEXT_SUBTITLE },
+ #endif
+     { VLC_CODEC_TELETEXT, AV_CODEC_ID_DVB_TELETEXT },
+diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
+index 594c337486a9..d3ba649f272a 100644
+--- a/modules/codec/avcodec/video.c
++++ b/modules/codec/avcodec/video.c
+@@ -257,12 +257,12 @@ static int lavc_GetVideoFormat(decoder_t
+         case AVCOL_TRC_BT2020_12:
+             fmt->transfer = TRANSFER_FUNC_BT2020;
+             break;
+-#if LIBAVUTIL_VERSION_CHECK( 55, 14, 0, 31, 100)
++#if LIBAVUTIL_VERSION_CHECK( 55, 31, 100)
+         case AVCOL_TRC_ARIB_STD_B67:
+             fmt->transfer = TRANSFER_FUNC_ARIB_B67;
+             break;
+ #endif
+-#if LIBAVUTIL_VERSION_CHECK( 55, 17, 0, 37, 100)
++#if LIBAVUTIL_VERSION_CHECK( 55, 37, 100)
+         case AVCOL_TRC_SMPTE2084:
+             fmt->transfer = TRANSFER_FUNC_SMPTE_ST2084;
+             break;
+@@ -1302,7 +1302,7 @@ static picture_t *DecodeBlock( decoder_t
+         }
+ 
+         /* Compute the PTS */
+-#if LIBAVCODEC_VERSION_CHECK(57, 24, 0, 61, 100)
++#if LIBAVCODEC_VERSION_CHECK(57, 61, 100)
+ # if LIBAVCODEC_VERSION_MICRO >= 100
+         vlc_tick_t i_pts = frame->best_effort_timestamp;
+ # else
+diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
+index 52fe7ef7f9eb..b9c434f0814f 100644
+--- a/modules/demux/avformat/mux.c
++++ b/modules/demux/avformat/mux.c
+@@ -61,7 +61,7 @@ struct sout_mux_sys_t
+     bool     b_write_header;
+     bool     b_write_keyframe;
+     bool     b_error;
+-#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 )
++#if LIBAVFORMAT_VERSION_CHECK( 57, 40, 100 )
+     bool     b_header_done;
+ #endif
+ };
+@@ -76,7 +76,7 @@ static int Mux      ( sout_mux_t * );
+ 
+ static int IOWrite( void *opaque, uint8_t *buf, int buf_size );
+ static int64_t IOSeek( void *opaque, int64_t offset, int whence );
+-#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 )
++#if LIBAVFORMAT_VERSION_CHECK( 57, 40, 100 )
+ static int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size,
+                               enum AVIODataMarkerType type, int64_t time);
+ #endif
+@@ -159,7 +159,7 @@ int avformat_OpenMux( vlc_object_t *p_th
+     p_sys->b_write_header = true;
+     p_sys->b_write_keyframe = false;
+     p_sys->b_error = false;
+-#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 )
++#if LIBAVFORMAT_VERSION_CHECK( 57, 40, 100 )
+     p_sys->io->write_data_type = IOWriteTyped;
+     p_sys->b_header_done = false;
+ #endif
+@@ -406,7 +406,7 @@ static int MuxBlock( sout_mux_t *p_mux,
+     return VLC_SUCCESS;
+ }
+ 
+-#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 )
++#if LIBAVFORMAT_VERSION_CHECK( 57, 40, 100 )
+ int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size,
+                               enum AVIODataMarkerType type, int64_t time)
+ {
+@@ -523,7 +523,7 @@ static int IOWrite( void *opaque, uint8_
+ 
+     if( p_sys->b_write_header )
+         p_buf->i_flags |= BLOCK_FLAG_HEADER;
+-#if LIBAVFORMAT_VERSION_CHECK( 57, 7, 0, 40, 100 )
++#if LIBAVFORMAT_VERSION_CHECK( 57, 40, 100 )
+     if( !p_sys->b_header_done )
+         p_buf->i_flags |= BLOCK_FLAG_HEADER;
+ #endif
+-- 
+GitLab
+
+
+From 8cf02acd84a1e099e15037d7c1e4dce6e8888df9 Mon Sep 17 00:00:00 2001
+From: Marvin Scholz 
+Date: Tue, 30 Nov 2021 18:30:28 +0100
+Subject: [PATCH] avcodec: remove LIBAVCODEC_VERSION_MICRO >= 100 checks
+
+This check was used to distinguish FFmpeg and libav, as libav support
+is removed now, this is no longer necessary.
+---
+ modules/codec/avcodec/avcommon_compat.h |  2 +-
+ modules/codec/avcodec/directx_va.c      |  4 ++--
+ modules/codec/avcodec/fourcc.c          | 18 +++++++-----------
+ modules/codec/avcodec/video.c           | 11 +----------
+ 4 files changed, 11 insertions(+), 24 deletions(-)
+
+diff --git a/modules/codec/avcodec/avcommon_compat.h b/modules/codec/avcodec/avcommon_compat.h
+index 010b570e0820..f56ce84b72db 100644
+--- a/modules/codec/avcodec/avcommon_compat.h
++++ b/modules/codec/avcodec/avcommon_compat.h
+@@ -36,7 +36,7 @@
+  * c is the micro version
+  */
+ #define LIBAVCODEC_VERSION_CHECK( a, b, c ) \
+-    (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, b, c ) )
++    (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( a, b, c ))
+ 
+ #ifndef AV_CODEC_FLAG_OUTPUT_CORRUPT
+ # define AV_CODEC_FLAG_OUTPUT_CORRUPT CODEC_FLAG_OUTPUT_CORRUPT
+diff --git a/modules/codec/avcodec/directx_va.c b/modules/codec/avcodec/directx_va.c
+index e240fec1ac51..7d180b574a28 100644
+--- a/modules/codec/avcodec/directx_va.c
++++ b/modules/codec/avcodec/directx_va.c
+@@ -274,7 +274,7 @@ static const directx_va_mode_t DXVA_MODE
+ 
+     /* VPx */
+     { "VP8",                                                                          &DXVA_ModeVP8_VLD,                      8, 0, NULL },
+-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 57, 17, 100 ) && LIBAVCODEC_VERSION_MICRO >= 100
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 57, 17, 100 )
+     { "VP9 profile 0",                                                                &DXVA_ModeVP9_VLD_Profile0,             8, AV_CODEC_ID_VP9, PROF_VP9_MAIN },
+     { "VP9 profile 2",                                                                &DXVA_ModeVP9_VLD_10bit_Profile2,       10, AV_CODEC_ID_VP9, PROF_VP9_10 },
+ #else
+@@ -284,7 +284,7 @@ static const directx_va_mode_t DXVA_MODE
+     { "VP9 profile Intel",                                                            &DXVA_ModeVP9_VLD_Intel,                8, 0, NULL },
+ 
+     /* AV1 */
+-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 58, 112, 103 ) && LIBAVCODEC_VERSION_MICRO >= 100
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 58, 112, 103 )
+     { "AV1 Main profile 8",                                                           &DXVA_ModeAV1_VLD_Profile0,             8, AV_CODEC_ID_AV1, PROF_AV1_MAIN },
+     { "AV1 Main profile 10",                                                          &DXVA_ModeAV1_VLD_Profile0,             10, AV_CODEC_ID_AV1, PROF_AV1_MAIN },
+     { "AV1 High profile 8",                                                           &DXVA_ModeAV1_VLD_Profile1,             8, AV_CODEC_ID_AV1, PROF_AV1_HIGH },
+diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
+index edab2cbdca8f..c14320aa1530 100644
+--- a/modules/codec/avcodec/fourcc.c
++++ b/modules/codec/avcodec/fourcc.c
+@@ -182,7 +182,7 @@ static const struct vlc_avcodec_fourcc v
+     /* AV_CODEC_ID_V210X */
+     { VLC_CODEC_TMV, AV_CODEC_ID_TMV },
+     { VLC_CODEC_V210, AV_CODEC_ID_V210 },
+-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 54, 50, 100 ) && LIBAVCODEC_VERSION_MICRO >= 100
++#if LIBAVCODEC_VERSION_CHECK( 54, 50, 100 )
+     { VLC_CODEC_VUYA, AV_CODEC_ID_AYUV },
+ #endif
+     /* AV_CODEC_ID_DPX */
+diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
+index d3ba649f272a..c5385d4574d9 100644
+--- a/modules/codec/avcodec/video.c
++++ b/modules/codec/avcodec/video.c
+@@ -196,10 +196,6 @@ static int lavc_GetVideoFormat(decoder_t
+     {
+         fmt->i_frame_rate = ctx->framerate.num;
+         fmt->i_frame_rate_base = ctx->framerate.den;
+-# if LIBAVCODEC_VERSION_MICRO <  100
+-        // for some reason libav don't thinkg framerate presents actually same thing as in ffmpeg
+-        fmt->i_frame_rate_base *= __MAX(ctx->ticks_per_frame, 1);
+-# endif
+     }
+     else if (ctx->time_base.num > 0 && ctx->time_base.den > 0)
+     {
+@@ -1303,11 +1299,7 @@ static picture_t *DecodeBlock( decoder_t
+ 
+         /* Compute the PTS */
+ #if LIBAVCODEC_VERSION_CHECK(57, 61, 100)
+-# if LIBAVCODEC_VERSION_MICRO >= 100
+         vlc_tick_t i_pts = frame->best_effort_timestamp;
+-# else
+-        vlc_tick_t i_pts = frame->pts;
+-# endif
+ #else
+         vlc_tick_t i_pts = frame->pkt_pts;
+ #endif
+@@ -1819,8 +1811,7 @@ no_reuse:
+     if (!can_hwaccel)
+         return swfmt;
+ 
+-#if (LIBAVCODEC_VERSION_MICRO >= 100) \
+-  && (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 83, 101))
++#if LIBAVCODEC_VERSION_CHECK(57, 83, 101)
+     if (p_context->active_thread_type)
+     {
+         msg_Warn(p_dec, "thread type %d: disabling hardware acceleration",
+-- 
+GitLab
+
+
+From 29747a8abb98ba53a64aa6761983891eeed2e0e4 Mon Sep 17 00:00:00 2001
+From: Ilkka Ollakka 
+Date: Tue, 4 Jul 2023 16:52:38 +0300
+Subject: [PATCH] avcodec: use p_enc audio channels instead of context channels
+ in encoder
+
+Allows to have less conditions in code when adding new ch_layout use
+---
+ modules/codec/avcodec/encoder.c | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
+index 48d41fe317cd..0ef334212ba4 100644
+--- a/modules/codec/avcodec/encoder.c
++++ b/modules/codec/avcodec/encoder.c
+@@ -781,7 +781,7 @@ int InitVideoEnc( vlc_object_t *p_this )
+                 }
+             }
+         }
+-        if( i_channels_src != p_context->channels )
++        if( i_channels_src != p_enc->fmt_out.audio.i_channels )
+             msg_Err( p_enc, "Channel layout not understood" );
+ 
+         p_sys->i_channels_to_reorder =
+@@ -887,7 +887,7 @@ int InitVideoEnc( vlc_object_t *p_this )
+     if( ret )
+     {
+         if( p_enc->fmt_in.i_cat != AUDIO_ES ||
+-                (p_context->channels <= 2 && i_codec_id != AV_CODEC_ID_MP2
++                (p_enc->fmt_out.audio.i_channels <= 2 && i_codec_id != AV_CODEC_ID_MP2
+                  && i_codec_id != AV_CODEC_ID_MP3) )
+ errmsg:
+         {
+@@ -912,7 +912,7 @@ errmsg:
+             goto error;
+         }
+ 
+-        if( p_context->channels > 2 )
++        if( p_enc->fmt_out.audio.i_channels > 2 )
+         {
+             p_context->channels = 2;
+             p_context->channel_layout = channel_mask[p_context->channels][1];
+@@ -1018,7 +1018,7 @@ errmsg:
+                                     p_context->frame_size :
+                                     AV_INPUT_BUFFER_MIN_SIZE;
+         p_sys->i_buffer_out = av_samples_get_buffer_size(NULL,
+-                p_sys->p_context->channels, p_sys->i_frame_size,
++                p_enc->fmt_out.audio.i_channels, p_sys->i_frame_size,
+                 p_sys->p_context->sample_fmt, DEFAULT_ALIGN);
+         p_sys->p_buffer = av_malloc( p_sys->i_buffer_out );
+         if ( unlikely( p_sys->p_buffer == NULL ) )
+@@ -1268,7 +1268,7 @@ static block_t *handle_delay_buffer( enc
+ {
+     block_t *p_block = NULL;
+     //How much we need to copy from new packet
+-    const size_t leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes;
++    const size_t leftover = leftover_samples * p_enc->fmt_out.audio.i_channels * p_sys->i_sample_bytes;
+ 
+     av_frame_unref( p_sys->frame );
+     p_sys->frame->format     = p_sys->p_context->sample_fmt;
+@@ -1291,7 +1291,7 @@ static block_t *handle_delay_buffer( enc
+         // We need to deinterleave from p_aout_buf to p_buffer the leftover bytes
+         if( p_sys->b_planar )
+             aout_Deinterleave( p_sys->p_interleave_buf, p_sys->p_buffer,
+-                p_sys->i_frame_size, p_sys->p_context->channels, p_enc->fmt_in.i_codec );
++                p_sys->i_frame_size, p_enc->fmt_out.audio.i_channels, p_enc->fmt_in.i_codec );
+         else
+             memcpy( p_sys->p_buffer + buffer_delay, p_aout_buf->p_buffer, leftover);
+ 
+@@ -1309,7 +1309,7 @@ static block_t *handle_delay_buffer( enc
+         memset( p_sys->p_buffer + (leftover+buffer_delay), 0, padding_size );
+         buffer_delay += padding_size;
+     }
+-    if( avcodec_fill_audio_frame( p_sys->frame, p_sys->p_context->channels,
++    if( avcodec_fill_audio_frame( p_sys->frame, p_enc->fmt_out.audio.i_channels,
+             p_sys->p_context->sample_fmt, p_sys->b_planar ? p_sys->p_interleave_buf : p_sys->p_buffer,
+             p_sys->i_buffer_out,
+             DEFAULT_ALIGN) < 0 )
+@@ -1339,7 +1339,7 @@ static block_t *EncodeAudio( encoder_t *
+ 
+     //i_bytes_left is amount of bytes we get
+     i_samples_left = p_aout_buf ? p_aout_buf->i_nb_samples : 0;
+-    buffer_delay = p_sys->i_samples_delay * p_sys->i_sample_bytes * p_sys->p_context->channels;
++    buffer_delay = p_sys->i_samples_delay * p_sys->i_sample_bytes * p_enc->fmt_out.audio.i_channels;
+ 
+     //p_sys->i_buffer_out = p_sys->i_frame_size * chan * p_sys->i_sample_bytes
+     //Calculate how many bytes we would need from current buffer to fill frame
+@@ -1408,12 +1408,12 @@ static block_t *EncodeAudio( encoder_t *
+         p_sys->frame->channels = p_sys->p_context->channels;
+ 
+         const int in_bytes = p_sys->frame->nb_samples *
+-            p_sys->p_context->channels * p_sys->i_sample_bytes;
++            p_enc->fmt_out.audio.i_channels* p_sys->i_sample_bytes;
+ 
+         if( p_sys->b_planar )
+         {
+             aout_Deinterleave( p_sys->p_buffer, p_aout_buf->p_buffer,
+-                               p_sys->frame->nb_samples, p_sys->p_context->channels, p_enc->fmt_in.i_codec );
++                               p_sys->frame->nb_samples, p_enc->fmt_out.audio.i_channels, p_enc->fmt_in.i_codec );
+ 
+         }
+         else
+@@ -1421,7 +1421,7 @@ static block_t *EncodeAudio( encoder_t *
+             memcpy(p_sys->p_buffer, p_aout_buf->p_buffer, in_bytes);
+         }
+ 
+-        if( avcodec_fill_audio_frame( p_sys->frame, p_sys->p_context->channels,
++        if( avcodec_fill_audio_frame( p_sys->frame, p_enc->fmt_out.audio.i_channels,
+                                     p_sys->p_context->sample_fmt,
+                                     p_sys->p_buffer,
+                                     p_sys->i_buffer_out,
+@@ -1447,7 +1447,7 @@ static block_t *EncodeAudio( encoder_t *
+     if( p_aout_buf->i_nb_samples > 0 )
+     {
+        memcpy( p_sys->p_buffer + buffer_delay, p_aout_buf->p_buffer,
+-               p_aout_buf->i_nb_samples * p_sys->i_sample_bytes * p_sys->p_context->channels);
++               p_aout_buf->i_nb_samples * p_sys->i_sample_bytes * p_enc->fmt_out.audio.i_channels);
+        p_sys->i_samples_delay += p_aout_buf->i_nb_samples;
+     }
+ 
+-- 
+GitLab
+
+
+From c4302ca59dd79efd7208a45a3fcdc44388fd03a8 Mon Sep 17 00:00:00 2001
+From: Ilkka Ollakka 
+Date: Tue, 4 Jul 2023 16:53:43 +0300
+Subject: [PATCH] avcodec: add handling of new ch_layout in audio encoder
+
+conditioned to avcodec version where is it added
+---
+ modules/codec/avcodec/encoder.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
+index 0ef334212ba4..38a8437261dc 100644
+--- a/modules/codec/avcodec/encoder.c
++++ b/modules/codec/avcodec/encoder.c
+@@ -914,8 +914,12 @@ errmsg:
+ 
+         if( p_enc->fmt_out.audio.i_channels > 2 )
+         {
++#if LIBAVCODEC_VERSION_CHECK(59, 24, 100)
++            av_channel_layout_default( &p_context->ch_layout, 2 );
++#else
+             p_context->channels = 2;
+             p_context->channel_layout = channel_mask[p_context->channels][1];
++#endif
+ 
+             /* Change fmt_in in order to ask for a channels conversion */
+             p_enc->fmt_in.audio.i_channels =
+@@ -1273,8 +1277,12 @@ static block_t *handle_delay_buffer( enc
+     av_frame_unref( p_sys->frame );
+     p_sys->frame->format     = p_sys->p_context->sample_fmt;
+     p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
++#if LIBAVCODEC_VERSION_CHECK(59, 24, 100)
++    av_channel_layout_copy(&p_sys->frame->ch_layout, &p_sys->p_context->ch_layout);
++#else
+     p_sys->frame->channel_layout = p_sys->p_context->channel_layout;
+     p_sys->frame->channels = p_sys->p_context->channels;
++#endif
+ 
+     p_sys->frame->pts        = date_Get( &p_sys->buffer_date ) * p_sys->p_context->time_base.den /
+                                 CLOCK_FREQ / p_sys->p_context->time_base.num;
+@@ -1404,8 +1412,12 @@ static block_t *EncodeAudio( encoder_t *
+         p_sys->frame->pts        = date_Get( &p_sys->buffer_date ) * p_sys->p_context->time_base.den /
+                                     CLOCK_FREQ / p_sys->p_context->time_base.num;
+ 
++#if LIBAVCODEC_VERSION_CHECK(59, 24, 100)
++        av_channel_layout_copy(&p_sys->frame->ch_layout, &p_sys->p_context->ch_layout);
++#else
+         p_sys->frame->channel_layout = p_sys->p_context->channel_layout;
+         p_sys->frame->channels = p_sys->p_context->channels;
++#endif
+ 
+         const int in_bytes = p_sys->frame->nb_samples *
+             p_enc->fmt_out.audio.i_channels* p_sys->i_sample_bytes;
+-- 
+GitLab
+
+
+From b73dc8841d999c6be9de718cd2cd3aeb13279792 Mon Sep 17 00:00:00 2001
+From: Ilkka Ollakka 
+Date: Tue, 4 Jul 2023 16:55:28 +0300
+Subject: [PATCH] avcodec: use ch_layout for channel layout in audio encoder
+
+channels and channel_layout has been deprecated in FFMPEG 5.1 and will be removed eventually
+
+also always create the mapping, as ch_layout is always there
+---
+ modules/codec/avcodec/encoder.c | 46 +++++++++++++--------------------
+ 1 file changed, 18 insertions(+), 28 deletions(-)
+
+diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
+index 38a8437261dc..f8bd2bbf939e 100644
+--- a/modules/codec/avcodec/encoder.c
++++ b/modules/codec/avcodec/encoder.c
+@@ -179,6 +179,7 @@ static const uint64_t pi_channels_map[][
+     { AV_CH_STEREO_RIGHT,      0 },
+ };
+ 
++#if !LIBAVCODEC_VERSION_CHECK(59, 24, 100)
+ static const uint32_t channel_mask[][2] = {
+     {0,0},
+     {AOUT_CHAN_CENTER, AV_CH_LAYOUT_MONO},
+@@ -191,6 +192,7 @@ static const uint32_t channel_mask[][2]
+     {AOUT_CHANS_7_1, AV_CH_LAYOUT_7POINT1},
+     {AOUT_CHANS_8_1, AV_CH_LAYOUT_OCTAGONAL},
+ };
++#endif
+ 
+ static const char *const ppsz_enc_options[] = {
+     "keyint", "bframes", "vt", "qmin", "qmax", "codec", "hq",
+@@ -737,48 +739,36 @@ int InitVideoEnc( vlc_object_t *p_this )
+         date_Set( &p_sys->buffer_date, AV_NOPTS_VALUE );
+         p_context->time_base.num = 1;
+         p_context->time_base.den = p_context->sample_rate;
+-        p_context->channels      = p_enc->fmt_out.audio.i_channels;
+-        p_context->channel_layout = channel_mask[p_context->channels][1];
+ 
+-        /* Setup Channel ordering for multichannel audio
++        /* Setup Channel ordering for audio
+          * as VLC channel order isn't same as libavcodec expects
+          */
+ 
+         p_sys->i_channels_to_reorder = 0;
+ 
+-        /* Specified order
++        /* Create channel layout for avcodec
+          * Copied from audio.c
+          */
+-        const unsigned i_order_max = 8 * sizeof(p_context->channel_layout);
+         uint32_t pi_order_dst[AOUT_CHAN_MAX] = { };
+         uint32_t order_mask = 0;
+         int i_channels_src = 0;
+ 
+-        if( p_context->channel_layout )
+-        {
+-            msg_Dbg( p_enc, "Creating channel order for reordering");
+-            for( unsigned i = 0; i < sizeof(pi_channels_map)/sizeof(*pi_channels_map); i++ )
+-            {
+-                if( p_context->channel_layout & pi_channels_map[i][0] )
+-                {
+-                    msg_Dbg( p_enc, "%d %"PRIx64" mapped to %"PRIx64"", i_channels_src, pi_channels_map[i][0], pi_channels_map[i][1]);
+-                    pi_order_dst[i_channels_src++] = pi_channels_map[i][1];
+-                    order_mask |= pi_channels_map[i][1];
+-                }
+-            }
+-        }
+-        else
++        msg_Dbg( p_enc, "Creating channel order for reordering");
++#if LIBAVCODEC_VERSION_CHECK(59, 24, 100)
++        av_channel_layout_default( &p_context->ch_layout, p_enc->fmt_out.audio.i_channels );
++        uint64_t channel_mask = p_context->ch_layout.u.mask;
++#else
++        p_context->channels = p_enc->fmt_out.audio.i_channels;
++        p_context->channel_layout = channel_mask[p_context->channels][1];
++        uint64_t channel_mask = p_context->channel_layout;
++#endif
++        for( unsigned i = 0; i < sizeof(pi_channels_map)/sizeof(*pi_channels_map); i++ )
+         {
+-            msg_Dbg( p_enc, "Creating default channel order for reordering");
+-            /* Create default order  */
+-            for( unsigned int i = 0; i < __MIN( i_order_max, (unsigned)p_sys->p_context->channels ); i++ )
++            if( channel_mask & pi_channels_map[i][0] )
+             {
+-                if( i < sizeof(pi_channels_map)/sizeof(*pi_channels_map) )
+-                {
+-                    msg_Dbg( p_enc, "%d channel is %"PRIx64"", i_channels_src, pi_channels_map[i][1]);
+-                    pi_order_dst[i_channels_src++] = pi_channels_map[i][1];
+-                    order_mask |= pi_channels_map[i][1];
+-                }
++                msg_Dbg( p_enc, "%d %"PRIx64" mapped to %"PRIx64"", i_channels_src, pi_channels_map[i][0], pi_channels_map[i][1]);
++                pi_order_dst[i_channels_src++] = pi_channels_map[i][1];
++                order_mask |= pi_channels_map[i][1];
+             }
+         }
+         if( i_channels_src != p_enc->fmt_out.audio.i_channels )
+-- 
+GitLab
+
+
+From bddf5ba19111d1cc4463d9876c4bc4ba75f82d7f Mon Sep 17 00:00:00 2001
+From: Ilkka Ollakka 
+Date: Wed, 5 Jul 2023 12:51:34 +0300
+Subject: [PATCH] avcodec: use p_dec->fmt_out instead of context channels on
+ audio channel-count
+
+reduces the need of ifdefs when adding ch_layout support
+---
+ modules/codec/avcodec/audio.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
+index 0937641f21ae..5044e1556231 100644
+--- a/modules/codec/avcodec/audio.c
++++ b/modules/codec/avcodec/audio.c
+@@ -484,15 +484,15 @@ static block_t * ConvertAVFrame( decoder
+     /* Interleave audio if required */
+     if( av_sample_fmt_is_planar( ctx->sample_fmt ) )
+     {
+-        p_block = block_Alloc(frame->linesize[0] * ctx->channels);
++        p_block = block_Alloc(frame->linesize[0] * p_dec->fmt_out.audio.i_channels );
+         if ( likely(p_block) )
+         {
+-            const void *planes[ctx->channels];
+-            for (int i = 0; i < ctx->channels; i++)
++            const void *planes[p_dec->fmt_out.audio.i_channels];
++            for (int i = 0; i < p_dec->fmt_out.audio.i_channels; i++)
+                 planes[i] = frame->extended_data[i];
+ 
+             aout_Interleave(p_block->p_buffer, planes, frame->nb_samples,
+-                            ctx->channels, p_dec->fmt_out.audio.i_format);
++                            p_dec->fmt_out.audio.i_channels, p_dec->fmt_out.audio.i_format);
+             p_block->i_nb_samples = frame->nb_samples;
+         }
+         av_frame_free(&frame);
+@@ -511,7 +511,7 @@ static block_t * ConvertAVFrame( decoder
+         {
+             aout_ChannelExtract( p_buffer->p_buffer,
+                                  p_dec->fmt_out.audio.i_channels,
+-                                 p_block->p_buffer, ctx->channels,
++                                 p_block->p_buffer, p_dec->fmt_out.audio.i_channels,
+                                  p_block->i_nb_samples, p_sys->pi_extraction,
+                                  p_dec->fmt_out.audio.i_bitspersample );
+             p_buffer->i_nb_samples = p_block->i_nb_samples;
+@@ -600,13 +600,13 @@ static void SetupOutputFormat( decoder_t
+     if( channel_layout )
+     {
+         for( unsigned i = 0; i < i_order_max
+-         && i_channels_src < p_sys->p_context->channels; i++ )
++         && i_channels_src < p_dec->fmt_out.audio.i_channels; i++ )
+         {
+             if( channel_layout & pi_channels_map[i][0] )
+                 pi_order_src[i_channels_src++] = pi_channels_map[i][1];
+         }
+ 
+-        if( i_channels_src != p_sys->p_context->channels && b_trust )
++        if( i_channels_src != p_dec->fmt_out.audio.i_channels && b_trust )
+             msg_Err( p_dec, "Channel layout not understood" );
+ 
+         /* Detect special dual mono case */
+-- 
+GitLab
+
+From 496f0f2a659c1339d1e37330d446e9b6ce96e76b Mon Sep 17 00:00:00 2001
+From: Ilkka Ollakka 
+Date: Wed, 5 Jul 2023 13:33:09 +0300
+Subject: [PATCH] avcodec: audio decoder to use ch_layout
+
+---
+ modules/codec/avcodec/audio.c | 42 ++++++++++++++++++++++++++++-------
+ 1 file changed, 34 insertions(+), 8 deletions(-)
+
+diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
+index 5044e1556231..2c85d83005c5 100644
+--- a/modules/codec/avcodec/audio.c
++++ b/modules/codec/avcodec/audio.c
+@@ -139,7 +139,11 @@ static int OpenAudioCodec( decoder_t *p_
+     }
+ 
+     ctx->sample_rate = p_dec->fmt_in.audio.i_rate;
+-    ctx->channels = p_dec->fmt_in.audio.i_channels;
++#if LIBAVCODEC_VERSION_CHECK(59, 24, 100)
++    av_channel_layout_default( &ctx->ch_layout, p_dec->fmt_in.audio.i_channels );
++#else
++    ctx->channels = p_dec->fmt_in.audio.i_channels;
++#endif
+     ctx->block_align = p_dec->fmt_in.audio.i_blockalign;
+     ctx->bit_rate = p_dec->fmt_in.i_bitrate;
+     ctx->bits_per_coded_sample = p_dec->fmt_in.audio.i_bitspersample;
+@@ -395,12 +399,17 @@ static int DecodeBlock( decoder_t *p_dec
+         ret = avcodec_receive_frame( ctx, frame );
+         if( ret == 0 )
+         {
++#if LIBAVCODEC_VERSION_CHECK(59, 24, 100)
++            int channels = frame->ch_layout.nb_channels;
++#else
++            int channels = ctx->channels;
++#endif
+             /* checks and init from first decoded frame */
+-            if( ctx->channels <= 0 || ctx->channels > INPUT_CHAN_MAX
++            if( channels <= 0 || channels > INPUT_CHAN_MAX
+              || ctx->sample_rate <= 0 )
+             {
+                 msg_Warn( p_dec, "invalid audio properties channels count %d, sample rate %d",
+-                          ctx->channels, ctx->sample_rate );
++                          channels, ctx->sample_rate );
+                 goto drop;
+             }
+             else if( p_dec->fmt_out.audio.i_rate != (unsigned int)ctx->sample_rate )
+@@ -580,6 +589,16 @@ static void SetupOutputFormat( decoder_t
+     p_dec->fmt_out.audio.i_rate = p_sys->p_context->sample_rate;
+ 
+     /* */
++#if LIBAVCODEC_VERSION_CHECK(59, 24, 100)
++    if( p_sys->i_previous_channels == p_sys->p_context->ch_layout.nb_channels &&
++        p_sys->i_previous_layout == p_sys->p_context->ch_layout.u.mask )
++        return;
++    if( b_trust )
++    {
++        p_sys->i_previous_channels = p_sys->p_context->ch_layout.nb_channels;
++        p_sys->i_previous_layout = p_sys->p_context->ch_layout.u.mask;
++    }
++#else
+     if( p_sys->i_previous_channels == p_sys->p_context->channels &&
+         p_sys->i_previous_layout == p_sys->p_context->channel_layout )
+         return;
+@@ -588,25 +607,32 @@ static void SetupOutputFormat( decoder_t
+         p_sys->i_previous_channels = p_sys->p_context->channels;
+         p_sys->i_previous_layout = p_sys->p_context->channel_layout;
+     }
++#endif
+ 
+-    const unsigned i_order_max = sizeof(pi_channels_map)/sizeof(*pi_channels_map);
+-    uint32_t pi_order_src[i_order_max];
++    uint32_t pi_order_src[AOUT_CHAN_MAX] = { 0 };
+ 
+     int i_channels_src = 0;
+-    int64_t channel_layout =
++#if LIBAVCODEC_VERSION_CHECK(59, 24, 100)
++    uint64_t channel_layout_mask = p_sys->p_context->ch_layout.u.mask;
++    int channel_count = p_sys->p_context->ch_layout.nb_channels;
++#else
++    uint64_t channel_layout_mask =
+         p_sys->p_context->channel_layout ? p_sys->p_context->channel_layout :
+         av_get_default_channel_layout( p_sys->p_context->channels );
++        (uint64_t)av_get_default_channel_layout( p_sys->p_context->channels );
++    int channel_count = p_sys->p_context->channels;
++#endif
+ 
+-    if( channel_layout )
++    if( channel_layout_mask )
+     {
+-        for( unsigned i = 0; i < i_order_max
+-         && i_channels_src < p_dec->fmt_out.audio.i_channels; i++ )
++        for( unsigned i = 0; pi_channels_map[i][0]
++         && i_channels_src < channel_count; i++ )
+         {
+-            if( channel_layout & pi_channels_map[i][0] )
++            if( channel_layout_mask & pi_channels_map[i][0] )
+                 pi_order_src[i_channels_src++] = pi_channels_map[i][1];
+         }
+ 
+-        if( i_channels_src != p_dec->fmt_out.audio.i_channels && b_trust )
++        if( i_channels_src != channel_count && b_trust )
+             msg_Err( p_dec, "Channel layout not understood" );
+ 
+         /* Detect special dual mono case */
+@@ -638,7 +664,7 @@ static void SetupOutputFormat( decoder_t
+     {
+         msg_Warn( p_dec, "no channel layout found");
+         p_dec->fmt_out.audio.i_physical_channels = 0;
+-        p_dec->fmt_out.audio.i_channels = p_sys->p_context->channels;
++        p_dec->fmt_out.audio.i_channels = channel_count;
+     }
+ 
+     aout_FormatPrepare( &p_dec->fmt_out.audio );
+-- 
+GitLab
+
+From 0ff86bf8a28a080340f600cb8561815fc43e3b4a Mon Sep 17 00:00:00 2001
+From: Ilkka Ollakka 
+Date: Wed, 5 Jul 2023 15:09:57 +0300
+Subject: [PATCH] avcodec/audio: make channel mapping array 0 terminated
+
+Also change pi_channels_src to be only AOUT_CHAN_MAX instead of same
+size as mapping array.
+---
+ modules/codec/avcodec/audio.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
+index 2c85d83005c5..d0c8bae750b2 100644
+--- a/modules/codec/avcodec/audio.c
++++ b/modules/codec/avcodec/audio.c
+@@ -577,6 +577,7 @@ static const uint64_t pi_channels_map[][
+     { AV_CH_TOP_BACK_RIGHT,    0 },
+     { AV_CH_STEREO_LEFT,       0 },
+     { AV_CH_STEREO_RIGHT,      0 },
++    { 0, 0 },
+ };
+ 
+ static void SetupOutputFormat( decoder_t *p_dec, bool b_trust )
+-- 
+GitLab
+
+
+From 1a57633d1820eb218771489505876fa55f8a8847 Mon Sep 17 00:00:00 2001
+From: Francois Cartegnie 
+Date: Tue, 23 Apr 2024 13:13:30 +0700
+Subject: [PATCH 1/4] codec: avcodec: map AYUV as RAWVIDEO with ffmpeg 6.0
+
+---
+ modules/codec/avcodec/fourcc.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
+index de7b9e1377bd..4ce2584bd303 100644
+--- a/modules/codec/avcodec/fourcc.c
++++ b/modules/codec/avcodec/fourcc.c
+@@ -182,7 +182,9 @@ static const struct vlc_avcodec_fourcc v
+     /* AV_CODEC_ID_V210X */
+     { VLC_CODEC_TMV, AV_CODEC_ID_TMV },
+     { VLC_CODEC_V210, AV_CODEC_ID_V210 },
+-#if LIBAVCODEC_VERSION_CHECK( 54, 50, 100 )
++#if LIBAVCODEC_VERSION_CHECK( 59, 42, 102 )
++    { VLC_CODEC_VUYA, AV_CODEC_ID_RAWVIDEO },
++#else
+     { VLC_CODEC_VUYA, AV_CODEC_ID_AYUV },
+ #endif
+     /* AV_CODEC_ID_DPX */
+-- 
+GitLab
+
+
+From 3ecdd252b42dca492c79470535703eae0dfc1093 Mon Sep 17 00:00:00 2001
+From: Francois Cartegnie 
+Date: Tue, 23 Apr 2024 13:14:53 +0700
+Subject: [PATCH 2/4] demux/mux: avformat: use ch_layout from ffmpeg 5.1
+
+---
+ modules/demux/avformat/demux.c | 4 ++++
+ modules/demux/avformat/mux.c   | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
+index 743e0534901c..87f5b41c0d82 100644
+--- a/modules/demux/avformat/demux.c
++++ b/modules/demux/avformat/demux.c
+@@ -401,7 +401,11 @@ int avformat_OpenDemux( vlc_object_t *p_
+             es_format_Init( &es_fmt, AUDIO_ES, fcc );
+             es_fmt.i_original_fourcc = CodecTagToFourcc( cp->codec_tag );
+             es_fmt.i_bitrate = cp->bit_rate;
++#if LIBAVUTIL_VERSION_CHECK( 57, 28, 100 )
++            es_fmt.audio.i_channels = cp->ch_layout.nb_channels;
++#else
+             es_fmt.audio.i_channels = cp->channels;
++#endif
+             es_fmt.audio.i_rate = cp->sample_rate;
+             es_fmt.audio.i_bitspersample = cp->bits_per_coded_sample;
+             es_fmt.audio.i_blockalign = cp->block_align;
+diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
+index 55fc891437c7..0e87942aa76a 100644
+--- a/modules/demux/avformat/mux.c
++++ b/modules/demux/avformat/mux.c
+@@ -267,7 +267,11 @@ static int AddStream( sout_mux_t *p_mux,
+     {
+     case AUDIO_ES:
+         codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
++#if LIBAVUTIL_VERSION_CHECK( 57, 28, 100 )
++        av_channel_layout_default( &codecpar->ch_layout, fmt->audio.i_channels );
++#else
+         codecpar->channels = fmt->audio.i_channels;
++#endif
+         codecpar->sample_rate = fmt->audio.i_rate;
+         stream->time_base = (AVRational){1, codecpar->sample_rate};
+         if (fmt->i_bitrate == 0) {
+-- 
+GitLab
+
+
+From 1c15a5e183df7e292afd27795548d3c2254a9bbd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= 
+Date: Mon, 6 May 2024 12:15:40 +0200
+Subject: [PATCH] demux/mux: avformat: Constify the buffer pointees
+
+in the write_packet from ffmpeg 6.1
+
+The deprecated FF_API_AVIO_WRITE_NONCONST was removed in ffmpeg 7.0.
+
+Ref:
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/2a68d945cd74265bb71c3d38b7a2e7f7d7e87be5
+https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/02aea61d69d8f81bc285e2131bf25f96a3e27feb
+---
+ modules/demux/avformat/mux.c | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
+index 0e87942aa76a..390aa3cb4dfd 100644
+--- a/modules/demux/avformat/mux.c
++++ b/modules/demux/avformat/mux.c
+@@ -75,9 +75,16 @@ static int AddStream( sout_mux_t *, sout_input_t * );
+ static void DelStream( sout_mux_t *, sout_input_t * );
+ static int Mux      ( sout_mux_t * );
+ 
++#if LIBAVFORMAT_VERSION_CHECK( 61, 01, 100 )
++static int IOWrite( void *opaque, const uint8_t *buf, int buf_size );
++#else
+ static int IOWrite( void *opaque, uint8_t *buf, int buf_size );
++#endif
+ static int64_t IOSeek( void *opaque, int64_t offset, int whence );
+-#if LIBAVFORMAT_VERSION_CHECK( 57, 40, 100 )
++#if LIBAVFORMAT_VERSION_CHECK( 61, 01, 100 )
++static int IOWriteTyped(void *opaque, const uint8_t *buf, int buf_size,
++                              enum AVIODataMarkerType type, int64_t time);
++#elif LIBAVFORMAT_VERSION_CHECK( 57, 40, 100 )
+ static int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size,
+                               enum AVIODataMarkerType type, int64_t time);
+ #endif
+@@ -436,8 +443,13 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input )
+ }
+ 
+ #if LIBAVFORMAT_VERSION_CHECK( 57, 40, 100 )
++#if LIBAVFORMAT_VERSION_CHECK( 61, 01, 100 )
++int IOWriteTyped(void *opaque, const uint8_t *buf, int buf_size,
++                              enum AVIODataMarkerType type, int64_t time)
++#else
+ int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size,
+                               enum AVIODataMarkerType type, int64_t time)
++#endif
+ {
+     VLC_UNUSED(time);
+ 
+@@ -533,7 +545,11 @@ static int Control( sout_mux_t *p_mux, int i_query, va_list args )
+ /*****************************************************************************
+  * I/O wrappers for libavformat
+  *****************************************************************************/
++#if LIBAVFORMAT_VERSION_CHECK( 61, 01, 100 )
++static int IOWrite( void *opaque, const uint8_t *buf, int buf_size )
++#else
+ static int IOWrite( void *opaque, uint8_t *buf, int buf_size )
++#endif
+ {
+     sout_mux_t *p_mux = opaque;
+     sout_mux_sys_t *p_sys = p_mux->p_sys;
+-- 
+GitLab
diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild
index 7f79e3fd32b..3f30eb609b4 100644
--- a/multimedia/vlc/vlc.SlackBuild
+++ b/multimedia/vlc/vlc.SlackBuild
@@ -91,6 +91,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 
+patch -p1 < $CWD/vlc-3.0.21-fedora_ffmpeg7-1.patch
+
 sed -i '/DEPRECATED/s:^://:' modules/text_renderer/freetype/text_layout.c
 
 patch -p1 < $CWD/dvdread.patch
@@ -119,6 +121,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
+patch -p1 < $CWD/4645.patch
+patch -p1 < $CWD/4665.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
@@ -138,6 +143,7 @@ LDFLAGS="$SLKLDFLAGS" \
   $runasroot \
   $aom \
   $lua
+sed -i -e '/^#define _FORTIFY_SOURCE/d' config.h
 make
 make DESTDIR=$PKG install
 
diff --git a/network/MEGAcmd/MEGAcmd.SlackBuild b/network/MEGAcmd/MEGAcmd.SlackBuild
index bda6fb6a148..1a66ac7809c 100644
--- a/network/MEGAcmd/MEGAcmd.SlackBuild
+++ b/network/MEGAcmd/MEGAcmd.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PRGNAM=MEGAcmd
 VERSION=${VERSION:-1.7.0}
 SDK=${SDK:-4.31.0b}
-FFMPEG4_PATCHREV=${FFMPEG4_PATCHREV:-1.7.0}
+FFMPEG6_PATCHREV=${FFMPEG6_PATCHREV:-1.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -78,8 +78,8 @@ cd $PRGNAM-${VERSION}_Linux/sdk
 tar --strip-components=1 -xvf $CWD/sdk-$SDK.tar.gz
 cd ../
 
-# Apply patch for FFmpeg4
-patch -p1 < $CWD/megacmd-${FFMPEG4_PATCHREV}_ffmpeg4.patch
+# Apply patch for FFmpeg6
+patch -p1 < $CWD/megacmd-${FFMPEG6_PATCHREV}_ffmpeg6.patch
 
 chown -R root:root .
 find -L . \
diff --git a/network/MEGAcmd/megacmd-1.7.0_ffmpeg4.patch b/network/MEGAcmd/megacmd-1.7.0_ffmpeg4.patch
deleted file mode 100644
index 78caff0b98e..00000000000
--- a/network/MEGAcmd/megacmd-1.7.0_ffmpeg4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sdk/src/gfx/freeimage.cpp	2024-05-23 06:07:49.544014882 +0900
-+++ b/sdk/src/gfx/freeimage.cpp	2024-05-23 06:12:29.575018194 +0900
-@@ -212,7 +212,7 @@
- #ifdef AV_CODEC_CAP_TRUNCATED
- #define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED
- #else
--#define CAP_TRUNCATED CODEC_CAP_TRUNCATED
-+#define CAP_TRUNCATED 0
- #endif
- 
- const char *GfxProviderFreeImage::supportedformatsFfmpeg()
diff --git a/network/MEGAcmd/megacmd-1.7.0_ffmpeg6.patch b/network/MEGAcmd/megacmd-1.7.0_ffmpeg6.patch
new file mode 100644
index 00000000000..54295ec85b2
--- /dev/null
+++ b/network/MEGAcmd/megacmd-1.7.0_ffmpeg6.patch
@@ -0,0 +1,27 @@
+diff -Naur MEGAcmd-1.7.0_Linux.orig/sdk/src/gfx/freeimage.cpp MEGAcmd-1.7.0_Linux/sdk/src/gfx/freeimage.cpp
+--- MEGAcmd-1.7.0_Linux.orig/sdk/src/gfx/freeimage.cpp	2024-05-17 16:19:43.000000000 +0200
++++ MEGAcmd-1.7.0_Linux/sdk/src/gfx/freeimage.cpp	2024-05-25 09:19:52.452609376 +0200
+@@ -209,12 +209,6 @@
+ 
+ #ifdef HAVE_FFMPEG
+ 
+-#ifdef AV_CODEC_CAP_TRUNCATED
+-#define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED
+-#else
+-#define CAP_TRUNCATED CODEC_CAP_TRUNCATED
+-#endif
+-
+ const char *GfxProviderFreeImage::supportedformatsFfmpeg()
+ {
+     return  ".264.265.3g2.3gp.3gpa.3gpp.3gpp2.mp3"
+@@ -330,10 +324,6 @@
+ 
+     // Force seeking to key frames
+     formatContext->seek2any = false;
+-    if (decoder->capabilities & CAP_TRUNCATED)
+-    {
+-        codecContext->flags |= CAP_TRUNCATED;
+-    }
+ 
+     AVPixelFormat sourcePixelFormat = static_cast(codecParm->format);
+     AVPixelFormat targetPixelFormat = AV_PIX_FMT_BGR24; //raw data expected by freeimage is in this format
diff --git a/network/MEGAsync/MEGAsync.SlackBuild b/network/MEGAsync/MEGAsync.SlackBuild
index 4d804db29e8..f16c80962eb 100644
--- a/network/MEGAsync/MEGAsync.SlackBuild
+++ b/network/MEGAsync/MEGAsync.SlackBuild
@@ -26,8 +26,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=MEGAsync
-VERSION=${VERSION:-4.5.3.0}
-SDK=${SDK:-3.8.2c}
+VERSION=${VERSION:-4.9.1.0}
+SDK=${SDK:-4.16.0c}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -83,7 +83,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/megasync-4.5.0.0_ffmpeg.patch
+patch -p1 < $CWD/megasync-4.9.1.0_ffmpeg6.patch
 cd src/MEGASync/mega
 patch -p1 < $CWD/megasync-4.5.0.0_pdfium.patch
 
diff --git a/network/MEGAsync/MEGAsync.info b/network/MEGAsync/MEGAsync.info
index db02860be91..c01bb2800b2 100644
--- a/network/MEGAsync/MEGAsync.info
+++ b/network/MEGAsync/MEGAsync.info
@@ -1,10 +1,10 @@
 PRGNAM="MEGAsync"
-VERSION="4.5.3.0"
+VERSION="4.9.1.0"
 HOMEPAGE="https://github.com/meganz/MEGAsync/"
-DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v4.5.3.0_Linux/MEGAsync-4.5.3.0_Linux.tar.gz \
-          https://github.com/meganz/sdk/archive/v3.8.2c/sdk-3.8.2c.tar.gz"
-MD5SUM="be0f1e070b6990c19d766990758ef997 \
-        ded79c86d1ddbe2572f0562fa1dc15fc"
+DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v4.9.1.0_Linux/MEGAsync-4.9.1.0_Linux.tar.gz \
+          https://github.com/meganz/sdk/archive/v4.16.0c/sdk-4.16.0c.tar.gz"
+MD5SUM="be9fca6eee9bad9de2f8999bec51ccbb  \
+        b8c50f486602b2a8af4866d098cae303"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="FreeImage libmediainfo"
diff --git a/network/MEGAsync/megasync-4.5.0.0_ffmpeg.patch b/network/MEGAsync/megasync-4.5.0.0_ffmpeg.patch
deleted file mode 100644
index a30d4a1eff7..00000000000
--- a/network/MEGAsync/megasync-4.5.0.0_ffmpeg.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur a/src/MEGASync/mega/src/gfx/freeimage.cpp b/src/MEGASync/mega/src/gfx/freeimage.cpp
---- a/src/MEGASync/mega/src/gfx/freeimage.cpp	2021-05-23 02:28:08.694081111 +0100
-+++ b/src/MEGASync/mega/src/gfx/freeimage.cpp	2021-05-23 02:29:56.189964969 +0100
-@@ -188,7 +188,7 @@
- 
-     // Force seeking to key frames
-     formatContext->seek2any = false;
--    videoStream->skip_to_keyframe = true;
-+    //videoStream->skip_to_keyframe = true;
-     if (decoder->capabilities & CAP_TRUNCATED)
-     {
-         codecContext.flags |= CAP_TRUNCATED;
-diff -Naur a/src/MEGASync/mega/src/gfx/qt.cpp b/src/MEGASync/mega/src/gfx/qt.cpp
---- a/src/MEGASync/mega/src/gfx/qt.cpp	2021-05-23 02:28:08.694081111 +0100
-+++ b/src/MEGASync/mega/src/gfx/qt.cpp	2021-05-23 02:29:36.172545153 +0100
-@@ -1209,7 +1209,7 @@
- 
-     // Force seeking to key frames
-     formatContext->seek2any = false;
--    videoStream->skip_to_keyframe = true;
-+    //videoStream->skip_to_keyframe = true;
-     if (decoder->capabilities & CAP_TRUNCATED)
-     {
-         codecContext.flags |= CAP_TRUNCATED;
diff --git a/network/MEGAsync/megasync-4.9.1.0_ffmpeg6.patch b/network/MEGAsync/megasync-4.9.1.0_ffmpeg6.patch
new file mode 100644
index 00000000000..f42c30d9222
--- /dev/null
+++ b/network/MEGAsync/megasync-4.9.1.0_ffmpeg6.patch
@@ -0,0 +1,40 @@
+--- a/src/MEGASync/mega/src/gfx/freeimage.cpp	2024-02-05 12:31:08.907475460 +0900
++++ b/src/MEGASync/mega/src/gfx/freeimage.cpp	2024-02-05 13:38:52.356174823 +0900
+@@ -209,11 +209,13 @@
+ 
+ #ifdef HAVE_FFMPEG
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 60
+ #ifdef AV_CODEC_CAP_TRUNCATED
+ #define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED
+ #else
+ #define CAP_TRUNCATED CODEC_CAP_TRUNCATED
+ #endif
++#endif
+ 
+ const char *GfxProviderFreeImage::supportedformatsFfmpeg()
+ {
+@@ -313,7 +315,7 @@
+ 
+     // Find decoder for video stream
+     AVCodecID codecId = codecParm->codec_id;
+-    AVCodec* decoder = avcodec_find_decoder(codecId);
++    auto decoder = avcodec_find_decoder(codecId);
+     if (!decoder)
+     {
+         LOG_warn << "Codec not found: " << codecId;
+@@ -330,11 +332,13 @@
+ 
+     // Force seeking to key frames
+     formatContext->seek2any = false;
+-    videoStream->skip_to_keyframe = true;
++    //videoStream->skip_to_keyframe = true;
++    #if LIBAVCODEC_VERSION_MAJOR < 60
+     if (decoder->capabilities & CAP_TRUNCATED)
+     {
+         codecContext->flags |= CAP_TRUNCATED;
+     }
++    #endif
+ 
+     AVPixelFormat sourcePixelFormat = static_cast(codecParm->format);
+     AVPixelFormat targetPixelFormat = AV_PIX_FMT_BGR24; //raw data expected by freeimage is in this format
diff --git a/network/avahi/README b/network/avahi/README
deleted file mode 100644
index 3057f78a16c..00000000000
--- a/network/avahi/README
+++ /dev/null
@@ -1,14 +0,0 @@
-Avahi is an implementation of the DNS Service Discovery and Multicast
-DNS specifications for Zeroconf Computing.  It uses D-BUS for
-communication between user applications and a system daemon.  The
-daemon is used to coordinate application efforts in caching replies,
-necessary to minimize the traffic imposed on networks.  This kind
-of technology is already found in Apple MacOS X (branded Rendezvous
-Bonjour and sometimes Zeroconf) and is very convenient.
-
-You will need to have an "avahi" user and group on the target
-system prior to installing the avahi package.  See README.SBo in this
-directory (it is also installed to the package docmentation directory)
-for more information and for setup notes.
-
-mono support is not working ATM so it's forcibly disabled.
diff --git a/network/avahi/README.SBo b/network/avahi/README.SBo
deleted file mode 100644
index d05e6bb6b91..00000000000
--- a/network/avahi/README.SBo
+++ /dev/null
@@ -1,43 +0,0 @@
-README.SBo (avahi)
-
-First, be sure you have an "avahi" user and group.  Do this *before*
-you install the avahi package.  We recommend uid/gid of 214, but 
-adjust as needed for your system.  Something like this should suffice:
-
-  # groupadd -g 214 avahi
-  # useradd -u 214 -g 214 -c "Avahi User" -d /dev/null -s /bin/false avahi
-
-
-Now start the Avahi daemon:
-
-	# /etc/rc.d/rc.avahidaemon start
-
-Optionally start the unicast DNS configuration daemon:
-
-	# /etc/rc.d/rc.avahidnsconfd start
-
-
-You will need to start avahi at boot by adding the following 
-to your /etc/rc.d/rc.local and make them executable:
-
-        # Start avahidaemon
-	if [ -x /etc/rc.d/rc.avahidaemon ]; then
-	  /etc/rc.d/rc.avahidaemon start
-	fi
-        # Start avahidnsconfd
-	if [ -x /etc/rc.d/rc.avahidnsconfd ]; then
-	  /etc/rc.d/rc.avahidnsconfd start
-	fi
-
-You will also want to put the following into /etc/rc.d/rc.local_shutdown
-(if that file does not exist, create it and make it executable):
-
-        # Stop avahidnsconfd
-	if [ -x /etc/rc.d/rc.avahidnsconfd ]; then
-	  /etc/rc.d/rc.avahidnsconfd stop
-	fi
-        # Stop avahidaemon
-	if [ -x /etc/rc.d/rc.avahidaemon ]; then
-	  /etc/rc.d/rc.avahidaemon stop
-	fi
-
diff --git a/network/avahi/avahi-discover.1 b/network/avahi/avahi-discover.1
deleted file mode 100644
index 085ff1354e1..00000000000
--- a/network/avahi/avahi-discover.1
+++ /dev/null
@@ -1,16 +0,0 @@
-.TH avahi-discover 1 User Manuals
-.SH NAME
-avahi-discover \- Browse for mDNS/DNS-SD services using the Avahi daemon
-.SH SYNOPSIS
-\fBavahi-discover
-\f1
-.SH DESCRIPTION
-Show a real-time graphical browse list for mDNS/DNS-SD network services running on the local LAN using the Avahi daemon.
-.SH OPTIONS
-avahi-discover takes no command line arguments at the moment.
-.SH AUTHORS
-The Avahi Developers ; Avahi is available from \fBhttp://avahi.org/\f1
-.SH SEE ALSO
-\fBavahi-daemon(8)\f1, \fBavahi-browse(1)\f1
-.SH COMMENTS
-This man page was written using \fBxml2man(1)\f1 by Oliver Kurth.
diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild
deleted file mode 100644
index e81a77cc29e..00000000000
--- a/network/avahi/avahi.SlackBuild
+++ /dev/null
@@ -1,201 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for avahi
-
-# Copyright 2008-2012  David Somero (dsomero@hotmail.com) Athens, TN, USA
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
-# 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.
-
-# 20220301 bkw: Modified by SlackBuilds.org, BUILD=7:
-# - don't include empty /run dir in package.
-# - remove useless INSTALL from doc dir.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=avahi
-VERSION=${VERSION:-0.8}
-BUILD=${BUILD:-7}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-# Support for mono
-if [ "${MONO:-no}" = "no" ]; then
-    MONO="--disable-mono"
-else
-    MONO="--enable-mono"
-fi
-MONO="--disable-mono" # mono support not working ATM
-
-warn_accounts() {
-  echo "  You must have an avahi user and group to run this script. "
-  echo "  Something like this should suffice for most systems: "
-  echo "      # groupadd -g 214 avahi"
-  echo "      # useradd -u 214 -g 214 -c "Avahi" -d /dev/null -s /bin/false avahi"
- exit 1
-}
-
-# Bail if user and/or group isn't valid on your system
-if ! getent passwd avahi &>/dev/null; then
-  warn_accounts
-fi
-if ! getent group avahi &>/dev/null; then
-  warn_accounts
-fi
-
-if [ "${ARCH}" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-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 {} \+
-
-# This patch is mine --rworkman
-patch -p1 --verbose < $CWD/patches/fixup_avahi-dnsconfd.action.patch
-
-# Thanks to LFS for this patch
-patch -p1 --verbose < $CWD/patches/ipv6_race_condition_fix.patch
-
-# Thanks to Debian for these patches
-patch -p1 --verbose < $CWD/patches/man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch
-patch -p1 --verbose < $CWD/patches/man-add-missing-bshell.1-symlink.patch
-patch -p1 --verbose < $CWD/patches/Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch
-patch -p1 --verbose < $CWD/patches/avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch
-patch -p1 --verbose < $CWD/patches/fix-bytestring-decoding-for-proper-display.patch
-patch -p1 --verbose < $CWD/patches/avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch
-patch -p1 --verbose < $CWD/patches/Fetch-build-db-from-upstream-git.patch
-patch -p1 --verbose < $CWD/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch
-patch -p1 --verbose < $CWD/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch
-patch -p1 --verbose < $CWD/patches/avahi-client-fix-resource-leak.patch
-patch -p1 --verbose < $CWD/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch
-patch -p1 --verbose < $CWD/patches/CVE-2021-3502.patch
-
-# Okay, I had to cheat a bit on the manual pages; there's a commit
-# in git that will fix this, so I just built a git checkout, grabbed
-# the built manual pages, and we'll drop them into place so the build
-# will work for this released version...
-cat $CWD/bssh.1 > man/bssh.1
-cat $CWD/avahi-discover.1 > man/avahi-discover.1
-
-autoreconf -vif
-
-export PYTHON=python3
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-systemdsystemunitdir=no \
-  --enable-tests \
-  --disable-static \
-  --disable-monodoc \
-  --disable-autoipd \
-  --enable-compat-libdns_sd \
-  --enable-python-dbus \
-  --enable-glib \
-  --enable-dbus \
-  --enable-python \
-  --enable-gtk \
-  --enable-gtk3 \
-  --enable-qt5 \
-  --disable-qt4 \
-  --disable-qt3 \
-  --enable-core-docs \
-  --with-dbus-sys=/usr/share/dbus-1/system.d \
-  --with-avahi-user=avahi \
-  --with-avahi-group=avahi \
-  --with-avahi-priv-access-group=netdev \
-  --with-distro=slackware \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$ARCH-slackware-linux \
-  $MONO
-
-make
-make install-strip DESTDIR=$PKG
-
-# 20220414 bkw: if this dir is empty, it doesn't need to be included
-# in the package.
-rmdir $PKG/run &> /dev/null || true
-
-rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la
-
-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
-
-mv $PKG/etc/rc.d/rc.avahidaemon $PKG/etc/rc.d/rc.avahidaemon.new
-mv $PKG/etc/rc.d/rc.avahidnsconfd $PKG/etc/rc.d/rc.avahidnsconfd.new
-mv $PKG/etc/avahi/avahi-daemon.conf $PKG/etc/avahi/avahi-daemon.conf.new
-
-sed -i "s|#!python3|#!/usr/bin/python3|g" $PKG/usr/bin/avahi-{discover,bookmarks}
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-rm -f docs/INSTALL
-cp -a LICENSE docs/* $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
-cat $CWD/doinst.sh  > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/avahi/avahi.info b/network/avahi/avahi.info
deleted file mode 100644
index ced5e61121b..00000000000
--- a/network/avahi/avahi.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="avahi"
-VERSION="0.8"
-HOMEPAGE="http://avahi.org/"
-DOWNLOAD="https://github.com/lathiat/avahi/releases/download/v0.8/avahi-0.8.tar.gz"
-MD5SUM="229c6aa30674fc43c202b22c5f8c2be7"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libdaemon"
-MAINTAINER="Robby Workman"
-EMAIL="rworkman@slackbuilds.org"
diff --git a/network/avahi/bssh.1 b/network/avahi/bssh.1
deleted file mode 100644
index 913554eb304..00000000000
--- a/network/avahi/bssh.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.TH bssh/bvnc/bshell 1 User Manuals
-.SH NAME
-bssh/bvnc/bshell \- Browse for SSH/VNC servers on the local network
-.SH SYNOPSIS
-\fBbssh
-
-bvnc
-
-bshell
-\f1
-.SH DESCRIPTION
-bssh/bvnc/bshell browses for SSH/VNC servers on the local network, shows them in a GUI for the user to select one and finally calls ssh/vncviewer after a selection was made.
-
-If the binary is called as bssh only ssh servers will be shown. If the binary is called as bvnc only VNC servers will be shown. If the binary is called as bshell both VNC and SSH servers are shown.
-.SH OPTIONS
-.TP
-\fB-s | --ssh\f1
-Browse for SSH servers (and only SSH servers) regardless under which name the binary is called.
-.TP
-\fB-v | --vnc\f1
-Browse for VNC servers (and only VNC servers) regardless under which name the binary is called.
-.TP
-\fB-S | --shell\f1
-Browse for both VNC and SSH servers regardless under which name the binary is called.
-.TP
-\fB-d | --domain=\f1 \fIDOMAIN\f1
-Browse in the specified domain. If omitted bssh/bvnc/bshell will browse in the default browsing domain (usually .local)
-.TP
-\fB-h | --help\f1
-Show help.
-.SH AUTHORS
-The Avahi Developers ; Avahi is available from \fBhttp://avahi.org/\f1
-.SH SEE ALSO
-\fBavahi-browse(1)\f1, \fBssh(1)\f1, \fBvncviewer(1)\f1
-.SH COMMENTS
-This man page was written using \fBxml2man(1)\f1 by Oliver Kurth.
diff --git a/network/avahi/doinst.sh b/network/avahi/doinst.sh
deleted file mode 100644
index 9bf5bd87720..00000000000
--- a/network/avahi/doinst.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-
-preserve_perms etc/rc.d/rc.avahidaemon.new
-preserve_perms etc/rc.d/rc.avahidnsconfd.new
-preserve_perms etc/avahi/avahi-daemon.conf.new
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-# Reload messagebus service
-if [ -x etc/rc.d/rc.messagebus ]; then
-  chroot . /etc/rc.d/rc.messagebus reload
-fi
-
diff --git a/network/avahi/patches/CVE-2021-3502.patch b/network/avahi/patches/CVE-2021-3502.patch
deleted file mode 100644
index 7b0449a2e4e..00000000000
--- a/network/avahi/patches/CVE-2021-3502.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 9d31939e55280a733d930b15ac9e4dda4497680c Mon Sep 17 00:00:00 2001
-From: Tommi Rantala 
-Date: Mon, 8 Feb 2021 11:04:43 +0200
-Subject: [PATCH] Fix NULL pointer crashes from #175
-
-avahi-daemon is crashing when running "ping .local".
-The crash is due to failing assertion from NULL pointer.
-Add missing NULL pointer checks to fix it.
-
-Introduced in #175 - merge commit 8f75a045709a780c8cf92a6a21e9d35b593bdecd
----
- avahi-core/browse-dns-server.c   | 5 ++++-
- avahi-core/browse-domain.c       | 5 ++++-
- avahi-core/browse-service-type.c | 3 +++
- avahi-core/browse-service.c      | 3 +++
- avahi-core/browse.c              | 3 +++
- avahi-core/resolve-address.c     | 5 ++++-
- avahi-core/resolve-host-name.c   | 5 ++++-
- avahi-core/resolve-service.c     | 5 ++++-
- 8 files changed, 29 insertions(+), 5 deletions(-)
-
-diff --git a/avahi-core/browse-dns-server.c b/avahi-core/browse-dns-server.c
-index 049752e9..c2d914fa 100644
---- a/avahi-core/browse-dns-server.c
-+++ b/avahi-core/browse-dns-server.c
-@@ -343,7 +343,10 @@ AvahiSDNSServerBrowser *avahi_s_dns_server_browser_new(
-         AvahiSDNSServerBrowser* b;
- 
-         b = avahi_s_dns_server_browser_prepare(server, interface, protocol, domain, type, aprotocol, flags, callback, userdata);
-+        if (!b)
-+            return NULL;
-+
-         avahi_s_dns_server_browser_start(b);
- 
-         return b;
--}
-\ No newline at end of file
-+}
-diff --git a/avahi-core/browse-domain.c b/avahi-core/browse-domain.c
-index f145d56a..06fa70c0 100644
---- a/avahi-core/browse-domain.c
-+++ b/avahi-core/browse-domain.c
-@@ -253,7 +253,10 @@ AvahiSDomainBrowser *avahi_s_domain_browser_new(
-         AvahiSDomainBrowser *b;
- 
-         b = avahi_s_domain_browser_prepare(server, interface, protocol, domain, type, flags, callback, userdata);
-+        if (!b)
-+            return NULL;
-+
-         avahi_s_domain_browser_start(b);
- 
-         return b;
--}
-\ No newline at end of file
-+}
-diff --git a/avahi-core/browse-service-type.c b/avahi-core/browse-service-type.c
-index fdd22dcd..b1fc7af8 100644
---- a/avahi-core/browse-service-type.c
-+++ b/avahi-core/browse-service-type.c
-@@ -171,6 +171,9 @@ AvahiSServiceTypeBrowser *avahi_s_service_type_browser_new(
-         AvahiSServiceTypeBrowser *b;
- 
-         b = avahi_s_service_type_browser_prepare(server, interface, protocol, domain, flags, callback, userdata);
-+        if (!b)
-+            return NULL;
-+
-         avahi_s_service_type_browser_start(b);
- 
-         return b;
-diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c
-index 5531360c..63e0275a 100644
---- a/avahi-core/browse-service.c
-+++ b/avahi-core/browse-service.c
-@@ -184,6 +184,9 @@ AvahiSServiceBrowser *avahi_s_service_browser_new(
-         AvahiSServiceBrowser *b;
- 
-         b = avahi_s_service_browser_prepare(server, interface, protocol, service_type, domain, flags, callback, userdata);
-+        if (!b)
-+            return NULL;
-+
-         avahi_s_service_browser_start(b);
- 
-         return b;
-diff --git a/avahi-core/browse.c b/avahi-core/browse.c
-index 2941e579..e8a915e9 100644
---- a/avahi-core/browse.c
-+++ b/avahi-core/browse.c
-@@ -634,6 +634,9 @@ AvahiSRecordBrowser *avahi_s_record_browser_new(
-         AvahiSRecordBrowser *b;
- 
-         b = avahi_s_record_browser_prepare(server, interface, protocol, key, flags, callback, userdata);
-+        if (!b)
-+            return NULL;
-+
-         avahi_s_record_browser_start_query(b);
- 
-         return b;
-diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c
-index ac0b29b1..e61dd242 100644
---- a/avahi-core/resolve-address.c
-+++ b/avahi-core/resolve-address.c
-@@ -286,7 +286,10 @@ AvahiSAddressResolver *avahi_s_address_resolver_new(
-         AvahiSAddressResolver *b;
- 
-         b = avahi_s_address_resolver_prepare(server, interface, protocol, address, flags, callback, userdata);
-+        if (!b)
-+            return NULL;
-+
-         avahi_s_address_resolver_start(b);
- 
-         return b;
--}
-\ No newline at end of file
-+}
-diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c
-index 808b0e72..4e8e5973 100644
---- a/avahi-core/resolve-host-name.c
-+++ b/avahi-core/resolve-host-name.c
-@@ -318,7 +318,10 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new(
-         AvahiSHostNameResolver *b;
- 
-         b = avahi_s_host_name_resolver_prepare(server, interface, protocol, host_name, aprotocol, flags, callback, userdata);
-+        if (!b)
-+            return NULL;
-+
-         avahi_s_host_name_resolver_start(b);
- 
-         return b;
--}
-\ No newline at end of file
-+}
-diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c
-index 66bf3cae..43771763 100644
---- a/avahi-core/resolve-service.c
-+++ b/avahi-core/resolve-service.c
-@@ -519,7 +519,10 @@ AvahiSServiceResolver *avahi_s_service_resolver_new(
-         AvahiSServiceResolver *b;
- 
-         b = avahi_s_service_resolver_prepare(server, interface, protocol, name, type, domain, aprotocol, flags, callback, userdata);
-+        if (!b)
-+            return NULL;
-+
-         avahi_s_service_resolver_start(b);
- 
-         return b;
--}
-\ No newline at end of file
-+}
diff --git a/network/avahi/patches/Fetch-build-db-from-upstream-git.patch b/network/avahi/patches/Fetch-build-db-from-upstream-git.patch
deleted file mode 100644
index eacb6dab5aa..00000000000
--- a/network/avahi/patches/Fetch-build-db-from-upstream-git.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Andreas Henriksson 
-Date: Sat, 26 Oct 2019 15:49:35 +0200
-Subject: Fetch build-db from upstream git
-
-Fetch the build-db file from:
-https://raw.githubusercontent.com/lathiat/avahi/master/service-type-database/build-db
-
-This file is missing dist tarball, likely caused by changes in:
-https://github.com/lathiat/avahi/pull/134
-
-Carry it as a patch for now.
----
- service-type-database/build-db | 49 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 49 insertions(+)
- create mode 100755 service-type-database/build-db
-
-diff --git a/service-type-database/build-db b/service-type-database/build-db
-new file mode 100755
-index 0000000..78ee892
---- /dev/null
-+++ b/service-type-database/build-db
-@@ -0,0 +1,49 @@
-+#!/usr/bin/env python
-+# -*-python-*-
-+# This file is part of avahi.
-+#
-+# avahi is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU Lesser General Public License as
-+# published by the Free Software Foundation; either version 2 of the
-+# License, or (at your option) any later version.
-+#
-+# avahi is distributed in the hope that it will be useful, but WITHOUT
-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
-+# License for more details.
-+#
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with avahi; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-+# USA.
-+
-+try:
-+    import anydbm as dbm
-+except ImportError:
-+    import dbm
-+
-+import sys
-+
-+if len(sys.argv) > 1:
-+    infn = sys.argv[1]
-+else:
-+    infn = "service-types"
-+
-+if len(sys.argv) > 2:
-+    outfn = sys.argv[2]
-+else:
-+    outfn = infn + ".db"
-+
-+db = dbm.open(outfn, "n")
-+
-+for ln in open(infn, "r"):
-+    ln = ln.strip(" \r\n\t")
-+    
-+    if ln == "" or ln.startswith("#"):
-+        continue
-+
-+    t, n = ln.split(":", 1)
-+
-+    db[t.strip()] = n.strip()
-+
-+db.close()
diff --git a/network/avahi/patches/Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch b/network/avahi/patches/Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch
deleted file mode 100644
index 076442706af..00000000000
--- a/network/avahi/patches/Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Andreas Henriksson 
-Date: Thu, 24 Aug 2017 17:52:19 +0200
-Subject: Ship avahi-discover(1), bssh(1) and bvnc(1) also for GTK3
-
-These manpages went missing when you disabled gtk2 builds....
-
-Forwarded: https://github.com/lathiat/avahi/pull/142
-Applied-upstream: 0.9, commit:751be804e891aec5701a059144e2f5cbfc981b36
----
- man/Makefile.am | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 77a27bd..289b942 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -56,7 +56,7 @@ man_MANS += \
- 	avahi-publish.1 \
- 	avahi-set-host-name.1
- 
--if HAVE_GTK
-+if HAVE_GTK2OR3
- man_MANS += \
- 	bssh.1
- endif
-@@ -64,12 +64,13 @@ endif
- if HAVE_PYTHON
- man_MANS += \
- 	avahi-bookmarks.1
--if HAVE_GTK
-+endif
-+
-+if HAVE_PYGOBJECT
- man_MANS += \
- 	avahi-discover.1
- endif
- endif
--endif
- 
- if ENABLE_AUTOIPD
- if HAVE_LIBDAEMON
-@@ -134,7 +135,7 @@ EXTRA_DIST = \
- if HAVE_DBUS
- 
- BSSH_LN =
--if HAVE_GTK
-+if HAVE_GTK2OR3
- if HAVE_GLIB
- BSSH_LN += $(LN_S) bssh.1 bvnc.1 &&
- BSSH_LN += $(LN_S) bssh.1 bshell.1 &&
diff --git a/network/avahi/patches/avahi-client-fix-resource-leak.patch b/network/avahi/patches/avahi-client-fix-resource-leak.patch
deleted file mode 100644
index 141828a2595..00000000000
--- a/network/avahi/patches/avahi-client-fix-resource-leak.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 374245ec1418e7e1e57120fcaf0a12ec695f5f6d Mon Sep 17 00:00:00 2001
-From: Michal Sekletar 
-Date: Wed, 24 Oct 2018 15:22:19 +0000
-Subject: [PATCH] avahi-client: fix resource leak
-
----
- avahi-client/browser.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/avahi-client/browser.c b/avahi-client/browser.c
-index c978d942..fa4a9a80 100644
---- a/avahi-client/browser.c
-+++ b/avahi-client/browser.c
-@@ -72,6 +72,8 @@ static void parse_domain_file(AvahiDomainBrowser *b) {
-         if (avahi_normalize_name(buf, domain, sizeof(domain)))
-             b->static_browse_domains = avahi_string_list_add(b->static_browse_domains, domain);
-     }
-+
-+    fclose(f);
- }
- 
- static void domain_browser_ref(AvahiDomainBrowser *db) {
diff --git a/network/avahi/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch b/network/avahi/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch
deleted file mode 100644
index 9984722893f..00000000000
--- a/network/avahi/patches/avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4b48927e8e2c721d103018b4ce39a164b6c2898f Mon Sep 17 00:00:00 2001
-From: Michal Sekletar 
-Date: Wed, 24 Oct 2018 15:38:48 +0000
-Subject: [PATCH] chroot: fix bogus assignments in assertions
-
----
- avahi-daemon/chroot.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/avahi-daemon/chroot.c b/avahi-daemon/chroot.c
-index ccd56be0..871b3b34 100644
---- a/avahi-daemon/chroot.c
-+++ b/avahi-daemon/chroot.c
-@@ -188,8 +188,8 @@ static int recv_fd(int fd) {
-             return -1;
-         }
- 
--        assert(h->cmsg_len = CMSG_LEN(sizeof(int)));
--        assert(h->cmsg_level = SOL_SOCKET);
-+        assert(h->cmsg_len == CMSG_LEN(sizeof(int)));
-+        assert(h->cmsg_level == SOL_SOCKET);
-         assert(h->cmsg_type == SCM_RIGHTS);
- 
-         return *((int*)CMSG_DATA(h));
diff --git a/network/avahi/patches/avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch b/network/avahi/patches/avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch
deleted file mode 100644
index 56a92addfcd..00000000000
--- a/network/avahi/patches/avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Simon McVittie 
-Date: Fri, 24 Apr 2020 11:25:41 +0100
-Subject: avahi-discover: Don't decode unicode strings, only bytestrings
-
-Unicode strings (unicode in Python 2, str or unicode in Python 3) don't
-have a decode method; only bytestrings (str or bytes in Python 2,
-bytes in Python 3) have that. Decode exactly the strings that need
-decoding.
-
-Resolves: https://github.com/lathiat/avahi/issues/275
-Signed-off-by: Simon McVittie 
-Forwarded: https://github.com/lathiat/avahi/pull/282
----
- avahi-python/avahi-discover/avahi-discover.py | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/avahi-python/avahi-discover/avahi-discover.py b/avahi-python/avahi-discover/avahi-discover.py
-index 4a2b575..fddf4a5 100755
---- a/avahi-python/avahi-discover/avahi-discover.py
-+++ b/avahi-python/avahi-discover/avahi-discover.py
-@@ -238,15 +238,17 @@ class Main_window:
-                 txts+="" + _("TXT") + " %s = %s\n" % (k,v)
-         else:
-             txts = "" + _("TXT Data:") + " " + _("empty") + ""
--        
--        txts = txts.decode("utf-8")
-+
-+        if isinstance(txts, bytes):     # Python 2
-+            txts = txts.decode("utf-8")
- 
-         infos = "" + _("Service Type:") + " %s\n"
-         infos += "" + _("Service Name:") + " %s\n"
-         infos += "" + _("Domain Name:") + " %s\n"
-         infos += "" + _("Interface:") + " %s %s\n"
-         infos += "" + _("Address:") + " %s/%s:%i\n%s"
--        infos = infos.decode("utf-8")
-+        if isinstance(infos, bytes):    # Python 2
-+            infos = infos.decode("utf-8")
-         infos = infos % (stype, name, domain, self.siocgifname(interface), self.protoname(protocol), host, address, port, txts.strip())
-         self.info_label.set_markup(infos)
- 
diff --git a/network/avahi/patches/avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch b/network/avahi/patches/avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch
deleted file mode 100644
index d9ba99f4d8b..00000000000
--- a/network/avahi/patches/avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: traffic-millions <60914101+traffic-millions@users.noreply.github.com>
-Date: Tue, 3 Mar 2020 11:15:48 +0800
-Subject: avahi_dns_packet_consume_uint32: fix potential undefined behavior
-
-avahi_dns_packet_consume_uint32 left shifts uint8_t values by 8, 16 and 24 bits to combine them into a 32-bit value. This produces an undefined behavior warning with gcc -fsanitize when fed input values of 128 or 255 however in testing no actual unexpected behavior occurs in practice and the 32-bit uint32_t is always correctly produced as the final value is immediately stored into a uint32_t and the compiler appears to handle this "correctly".
-
-Cast the intermediate values to uint32_t to prevent this warning and ensure the intended result is explicit.
-
-Closes: #267
-Closes: #268
-Reference: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19304
-Origin: upstream, 0.9, commit:b897ca43ac100d326d118e5877da710eb7f836f9
----
- avahi-core/dns.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/avahi-core/dns.c b/avahi-core/dns.c
-index 7c38f42..d793b76 100644
---- a/avahi-core/dns.c
-+++ b/avahi-core/dns.c
-@@ -455,7 +455,7 @@ int avahi_dns_packet_consume_uint32(AvahiDnsPacket *p, uint32_t *ret_v) {
-         return -1;
- 
-     d = (uint8_t*) (AVAHI_DNS_PACKET_DATA(p) + p->rindex);
--    *ret_v = (d[0] << 24) | (d[1] << 16) | (d[2] << 8) | d[3];
-+    *ret_v = ((uint32_t)d[0] << 24) | ((uint32_t)d[1] << 16) | ((uint32_t)d[2] << 8) | (uint32_t)d[3];
-     p->rindex += sizeof(uint32_t);
- 
-     return 0;
diff --git a/network/avahi/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch b/network/avahi/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch
deleted file mode 100644
index 3e0725a6024..00000000000
--- a/network/avahi/patches/avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 447affe29991ee99c6b9732fc5f2c1048a611d3b Mon Sep 17 00:00:00 2001
-From: Riccardo Schirone 
-Date: Fri, 26 Mar 2021 11:50:24 +0100
-Subject: [PATCH] Avoid infinite-loop in avahi-daemon by handling HUP event in
- client_work
-
-If a client fills the input buffer, client_work() disables the
-AVAHI_WATCH_IN event, thus preventing the function from executing the
-`read` syscall the next times it is called. However, if the client then
-terminates the connection, the socket file descriptor receives a HUP
-event, which is not handled, thus the kernel keeps marking the HUP event
-as occurring. While iterating over the file descriptors that triggered
-an event, the client file descriptor will keep having the HUP event and
-the client_work() function is always called with AVAHI_WATCH_HUP but
-without nothing being done, thus entering an infinite loop.
-
-See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=984938
----
- avahi-daemon/simple-protocol.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/avahi-daemon/simple-protocol.c b/avahi-daemon/simple-protocol.c
-index 3e0ebb11..6c0274d6 100644
---- a/avahi-daemon/simple-protocol.c
-+++ b/avahi-daemon/simple-protocol.c
-@@ -424,6 +424,11 @@ static void client_work(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AvahiWatchEv
-         }
-     }
- 
-+    if (events & AVAHI_WATCH_HUP) {
-+        client_free(c);
-+        return;
-+    }
-+
-     c->server->poll_api->watch_update(
-         watch,
-         (c->outbuf_length > 0 ? AVAHI_WATCH_OUT : 0) |
diff --git a/network/avahi/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch b/network/avahi/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch
deleted file mode 100644
index 3017043d47d..00000000000
--- a/network/avahi/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From: Simon McVittie 
-Date: Thu, 7 May 2020 12:13:56 +0100
-Subject: build-db: Use the same database format that the C code expects
-
-Otherwise, Python 2 anydbm will preferentially choose Berkeley DB format
-(dbhash/bsddb), which is neither GNU gdbm nor traditional Unix (n)dbm.
-
-Signed-off-by: Simon McVittie 
-Fixes: https://github.com/lathiat/avahi/issues/260
----
- configure.ac                      | 11 ++++++++---
- service-type-database/Makefile.am |  4 ++--
- service-type-database/build-db    | 27 +++++++++++++++++++++------
- 3 files changed, 31 insertions(+), 11 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 58db8c7..5aea4e7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -871,9 +871,14 @@ if test "x$HAVE_PYTHON" = "xyes" ; then
-         fi
- 
-         AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)])
--        if test "x$HAVE_GDBM" = "xyes" || test "x$HAVE_DBM" = "xyes"; then
--            AM_CHECK_PYMOD(anydbm,,,[
--                AM_CHECK_PYMOD(dbm,,,[AC_MSG_ERROR(Could not find Python module dbm)])
-+        if test "x$HAVE_GDBM" = "xyes"; then
-+            AM_CHECK_PYMOD([dbm.gnu], [], [], [
-+                AM_CHECK_PYMOD([gdbm], [], [], [AC_MSG_ERROR(Could not find Python module dbm.gnu or gdbm)])
-+            ])
-+        fi
-+        if test "x$HAVE_DBM" = "xyes"; then
-+            AM_CHECK_PYMOD([dbm.ndbm], [], [], [
-+                AM_CHECK_PYMOD([dbm], [], [], [AC_MSG_ERROR(Could not find Python module dbm.ndbm or dbm)])
-             ])
-         fi
-     fi
-diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am
-index f9fa082..0ead0f6 100644
---- a/service-type-database/Makefile.am
-+++ b/service-type-database/Makefile.am
-@@ -28,7 +28,7 @@ noinst_SCRIPTS=build-db
- pkglibdata_DATA+=service-types.db
- 
- service-types.db: service-types
--	$(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \
-+	$(AM_V_GEN)$(PYTHON) build-db --gnu $< $@.coming && \
- 	mv $@.coming $@
- 
- CLEANFILES = service-types.db
-@@ -44,7 +44,7 @@ service-types.db.pag: service-types.db
- service-types.db.dir: service-types.db
- 	$(AM_V_GEN)mv service-types.db.coming.dir service-types.db.dir
- service-types.db: service-types build-db
--	$(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \
-+	$(AM_V_GEN)$(PYTHON) build-db --ndbm $< $@.coming && \
- 	if test -f "$@.coming"; then mv $@.coming $@; fi
- 
- CLEANFILES = service-types.db*
-diff --git a/service-type-database/build-db b/service-type-database/build-db
-index 78ee892..6415d27 100755
---- a/service-type-database/build-db
-+++ b/service-type-database/build-db
-@@ -17,13 +17,28 @@
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- # USA.
- 
--try:
--    import anydbm as dbm
--except ImportError:
--    import dbm
--
- import sys
- 
-+if sys.argv[1] == '--gnu':
-+    if sys.version_info >= (3,):
-+        import dbm.gnu as chosen_dbm
-+    else:
-+        import gdbm as chosen_dbm
-+
-+    sys.argv[1:] = sys.argv[2:]
-+elif sys.argv[1] == '--ndbm':
-+    if sys.version_info >= (3,):
-+        import dbm.ndbm as chosen_dbm
-+    else:
-+        import dbm as chosen_dbm
-+
-+    sys.argv[1:] = sys.argv[2:]
-+else:
-+    if sys.version_info >= (3,):
-+        import dbm as chosen_dbm
-+    else:
-+        import anydbm as chosen_dbm
-+
- if len(sys.argv) > 1:
-     infn = sys.argv[1]
- else:
-@@ -34,7 +49,7 @@ if len(sys.argv) > 2:
- else:
-     outfn = infn + ".db"
- 
--db = dbm.open(outfn, "n")
-+db = chosen_dbm.open(outfn, "n")
- 
- for ln in open(infn, "r"):
-     ln = ln.strip(" \r\n\t")
diff --git a/network/avahi/patches/fix-bytestring-decoding-for-proper-display.patch b/network/avahi/patches/fix-bytestring-decoding-for-proper-display.patch
deleted file mode 100644
index bfb826db936..00000000000
--- a/network/avahi/patches/fix-bytestring-decoding-for-proper-display.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: =?utf-8?q?=C3=89ric_Araujo?= 
-Date: Sat, 29 Feb 2020 19:14:04 -0500
-Subject: fix bytestring decoding for proper display
-
----
- avahi-python/avahi-discover/avahi-discover.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/avahi-python/avahi-discover/avahi-discover.py b/avahi-python/avahi-discover/avahi-discover.py
-index 0db705d..4a2b575 100755
---- a/avahi-python/avahi-discover/avahi-discover.py
-+++ b/avahi-python/avahi-discover/avahi-discover.py
-@@ -238,12 +238,15 @@ class Main_window:
-                 txts+="" + _("TXT") + " %s = %s\n" % (k,v)
-         else:
-             txts = "" + _("TXT Data:") + " " + _("empty") + ""
-+        
-+        txts = txts.decode("utf-8")
- 
-         infos = "" + _("Service Type:") + " %s\n"
-         infos += "" + _("Service Name:") + " %s\n"
-         infos += "" + _("Domain Name:") + " %s\n"
-         infos += "" + _("Interface:") + " %s %s\n"
-         infos += "" + _("Address:") + " %s/%s:%i\n%s"
-+        infos = infos.decode("utf-8")
-         infos = infos % (stype, name, domain, self.siocgifname(interface), self.protoname(protocol), host, address, port, txts.strip())
-         self.info_label.set_markup(infos)
- 
diff --git a/network/avahi/patches/fixup_avahi-dnsconfd.action.patch b/network/avahi/patches/fixup_avahi-dnsconfd.action.patch
deleted file mode 100644
index 88f9b5f8077..00000000000
--- a/network/avahi/patches/fixup_avahi-dnsconfd.action.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-avahi-dnsconfd.action looks for /sbin/netconfig, and if found, attempts to 
-use it to modify /etc/resolv.conf.  While *our* netconfig and SuSE's
-netconfig started out the same, they're quite different these days, and
-thus the result is /etc/HOSTNAME getting set to some nonsense such as:
-  INTERFACE='eth0'.DNSSERVERS='192.168.13.1'
-This was quite some fun tracking down, by the way...  :-)  --rworkman
-
-
-diff -Nur avahi-0.6.30.orig/avahi-dnsconfd/avahi-dnsconfd.action avahi-0.6.30/avahi-dnsconfd/avahi-dnsconfd.action
---- avahi-0.6.30.orig/avahi-dnsconfd/avahi-dnsconfd.action	2010-06-28 22:30:34.000000000 -0500
-+++ avahi-0.6.30/avahi-dnsconfd/avahi-dnsconfd.action	2012-01-21 16:18:24.337986754 -0600
-@@ -33,48 +33,16 @@
- #   $AVAHI_INTERFACE_DNS_SERVERS   A whitespace seperated list of DNS servers on $AVAHI_INTERFACE
- #   $AVAHI_DNS_SERVERS             The complete list of all DNS servers found on all interfaces
- 
--if [ -x /sbin/netconfig ]; then
--    # SUSE method on 11.1+
--    if [ -n "$AVAHI_INTERFACE_DNS_SERVERS" ]; then
--	/sbin/netconfig modify -s avahi -i "$AVAHI_INTERFACE" <<-EOF
--	INTERFACE='$AVAHI_INTERFACE'
--	DNSSERVERS='$AVAHI_INTERFACE_DNS_SERVERS'
--	EOF
--    else
--	/sbin/netconfig remove -s avahi -i "$AVAHI_INTERFACE"
--    fi
--elif [ -x /sbin/modify_resolvconf ] ; then
--    # method for SUSE <= 11.0
--    if [ -n "$AVAHI_DNS_SERVERS" ]; then
--	/sbin/modify_resolvconf modify -s avahi -t - -p avahi-dnsconfd -n "$AVAHI_DNS_SERVERS" <<-EOF
--	if you don't like avahi to update your Nameservers
--	disable the avahi-dnsconfd init script
--	EOF
--    else
--	/sbin/modify_resolvconf restore -s avahi
--    fi
--elif [ -x /sbin/resolvconf ] ; then
- 
--    # We have Debian's resolvconf tool
--
--    if [ "x$AVAHI_INTERFACE_DNS_SERVERS" = "x" ] ; then
--        /sbin/resolvconf -d "$AVAHI_INTERFACE.avahi"
--    else
--        for n in $AVAHI_INTERFACE_DNS_SERVERS ; do 
--            echo "nameserver $n"
--        done | /sbin/resolvconf -a "$AVAHI_INTERFACE.avahi"
--    fi
--else
--
--    # No resolvconf tool available
--
--    if [ "x$AVAHI_DNS_SERVERS" = "x" ] ; then
-+if [ "x$AVAHI_DNS_SERVERS" = "x" ] ; then
-         test -f /etc/resolv.conf.avahi && mv /etc/resolv.conf.avahi /etc/resolv.conf
--    else
-+else
-         test -f /etc/resolv.conf.avahi || mv /etc/resolv.conf /etc/resolv.conf.avahi
- 
--        for n in $AVAHI_DNS_SERVERS ; do 
--            echo "nameserver $n"
--        done > /etc/resolv.conf
--    fi
-+        grep -v ^nameserver /etc/resolv.conf.avahi > /etc/resolv.conf
-+
-+        for n in $AVAHI_DNS_SERVERS ; do
-+                echo "nameserver $n"
-+        done >> /etc/resolv.conf
- fi
-+
- 
diff --git a/network/avahi/patches/ipv6_race_condition_fix.patch b/network/avahi/patches/ipv6_race_condition_fix.patch
deleted file mode 100644
index 3418b1a11c4..00000000000
--- a/network/avahi/patches/ipv6_race_condition_fix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Submitted By:            Douglas R. Reno 
-Date:                    2020-10-19
-Initial Package Version: 0.8
-Upstream Status:         PR, not applied
-Origin:                  Upstream PR (github.com/lathiat/avahi/pull/309)
-Description:             Fixes a race condition when multiple NICs are in use
-                         when IPv6 is enabled. This will exhibit behavior where
-                         messages about withdrawing address records, registering
-                         access records, and new hostname announcements are
-                         spammed to the log every second.
-
-diff -Naurp avahi-0.8.orig/avahi-core/server.c avahi-0.8/avahi-core/server.c
---- avahi-0.8.orig/avahi-core/server.c	2020-02-16 21:41:24.939967558 -0600
-+++ avahi-0.8/avahi-core/server.c	2020-10-19 11:07:22.054861721 -0500
-@@ -193,7 +193,7 @@ static void withdraw_rrset(AvahiServer *
-         withdraw_entry(s, e);
- }
- 
--static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface *i) {
-+static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface *i, int from_local_iface) {
-     AvahiEntry *e, *n;
-     int ours = 0, won = 0, lost = 0;
- 
-@@ -210,7 +210,7 @@ static void incoming_probe(AvahiServer *
-         if (e->dead)
-             continue;
- 
--        if ((cmp = avahi_record_lexicographical_compare(e->record, record)) == 0) {
-+        if ((cmp = avahi_record_lexicographical_compare(e->record, record)) == 0 || from_local_iface) {
-             ours = 1;
-             break;
-         } else {
-@@ -639,7 +639,7 @@ static void handle_query_packet(AvahiSer
-             if (!avahi_key_is_pattern(record->key)) {
-                 if (!from_local_iface)
-                     reflect_probe(s, i, record);
--                incoming_probe(s, record, i);
-+                incoming_probe(s, record, i, from_local_iface);
-             }
- 
-             avahi_record_unref(record);
-@@ -961,8 +961,7 @@ static void dispatch_packet(AvahiServer
-         return;
- 
-     /* We don't want to reflect local traffic, so we check if this packet is generated locally. */
--    if (s->config.enable_reflector)
--        from_local_iface = originates_from_local_iface(s, iface, src_address, port);
-+    from_local_iface = originates_from_local_iface(s, iface, src_address, port);
- 
-     if (avahi_dns_packet_check_valid_multicast(p) < 0) {
-         avahi_log_debug("Received invalid packet.");
diff --git a/network/avahi/patches/man-add-missing-bshell.1-symlink.patch b/network/avahi/patches/man-add-missing-bshell.1-symlink.patch
deleted file mode 100644
index 1bcbbb13e24..00000000000
--- a/network/avahi/patches/man-add-missing-bshell.1-symlink.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Michael Biebl 
-Date: Sun, 17 Sep 2017 12:52:39 +0200
-Subject: man: add missing bshell.1 symlink
-
-The bshell binary is missing a symlink to its manual page. It should be
-symlinked to the man page for bssh, just like how the bvnc man page is.
-
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=655190
-Forwarded: https://github.com/lathiat/avahi/pull/148
-Applied-upstream: 0.9, commit:f983df44870b602179b493f9c3d113753b378e27
----
- man/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/man/Makefile.am b/man/Makefile.am
-index d38267c..77a27bd 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -137,12 +137,13 @@ BSSH_LN =
- if HAVE_GTK
- if HAVE_GLIB
- BSSH_LN += $(LN_S) bssh.1 bvnc.1 &&
-+BSSH_LN += $(LN_S) bssh.1 bshell.1 &&
- endif
- endif
- install-exec-local:
- 	mkdir -p $(DESTDIR)/$(mandir)/man1 && \
- 		cd $(DESTDIR)/$(mandir)/man1 && \
--		rm -f avahi-resolve-host-name.1 avahi-resolve-address.1 avahi-browse-domains.1 avahi-publish-address.1 avahi-publish-service.1 bvnc.1 && \
-+		rm -f avahi-resolve-host-name.1 avahi-resolve-address.1 avahi-browse-domains.1 avahi-publish-address.1 avahi-publish-service.1 bvnc.1 bshell.1 && \
- 		$(BSSH_LN) \
- 		$(LN_S) avahi-resolve.1 avahi-resolve-host-name.1 && \
- 		$(LN_S) avahi-resolve.1 avahi-resolve-address.1 && \
diff --git a/network/avahi/patches/man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch b/network/avahi/patches/man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch
deleted file mode 100644
index 94d8d9517a7..00000000000
--- a/network/avahi/patches/man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Biebl 
-Date: Sun, 17 Sep 2017 10:57:47 +0200
-Subject: man: fix reference to avahi-autoipd.action(8) in avahi-autoipd(8)
-
-Forwarded: https://github.com/lathiat/avahi/pull/147
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=840833
-Applied-upstream: 0.9, commit:1905a6b878064c6cc9bb96a1fc17ef77c75787c6
----
- man/avahi-autoipd.8.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/man/avahi-autoipd.8.xml.in b/man/avahi-autoipd.8.xml.in
-index 7137c30..23764a5 100644
---- a/man/avahi-autoipd.8.xml.in
-+++ b/man/avahi-autoipd.8.xml.in
-@@ -150,7 +150,7 @@
- 
- 	

- 	  

--        , 
-+        , 
- 	  

- 
-       
http://avahi.org/wiki/AvahiAutoipd documents how avahi-autoipd is best packaged and integrated into distributions.

diff --git a/network/avahi/patches/series b/network/avahi/patches/series
deleted file mode 100644
index 1246744108d..00000000000
--- a/network/avahi/patches/series
+++ /dev/null
@@ -1,13 +0,0 @@
-avahi-dnsconfd.service-Drop-Also-avahi-daemon.socket.patch
-man-fix-reference-to-avahi-autoipd.action-8-in-avahi-auto.patch
-man-add-missing-bshell.1-symlink.patch
-Ship-avahi-discover-1-bssh-1-and-bvnc-1-also-for-GTK3.patch
-avahi_dns_packet_consume_uint32-fix-potential-undefined-b.patch
-fix-bytestring-decoding-for-proper-display.patch
-avahi-discover-Don-t-decode-unicode-strings-only-bytestri.patch
-Fetch-build-db-from-upstream-git.patch
-build-db-Use-the-same-database-format-that-the-C-code-exp.patch
-avahi-daemon-chroot-fix-bogus-assignments-in-assertions.patch
-avahi-client-fix-resource-leak.patch
-avoid-infinite-loop-in-avahi-daemon-by-handling-hup-event-in-client-work.patch
-CVE-2021-3502.patch
diff --git a/network/avahi/slack-desc b/network/avahi/slack-desc
deleted file mode 100644
index 8fb66245a43..00000000000
--- a/network/avahi/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------------------------------------------------------|
-avahi: avahi (service discovery aka zeroconf)
-avahi:
-avahi: Avahi is an Implementation the DNS Service Discovery and Multicast
-avahi: DNS specifications for Zeroconf Computing. It uses D-BUS for
-avahi: communication between user applications and a system daemon. The
-avahi: daemon is used to coordinate application efforts in caching replies,
-avahi: necessary to minimize the traffic imposed on networks. This kind of
-avahi: technology  is already found  in  Apple MacOS X (branded Rendezvous
-avahi: Bonjour and sometimes Zeroconf) and is very convenient.
-avahi:
-avahi:
diff --git a/network/bitchx/bitchx.SlackBuild b/network/bitchx/bitchx.SlackBuild
index a8ecee895f5..396ef017fb6 100644
--- a/network/bitchx/bitchx.SlackBuild
+++ b/network/bitchx/bitchx.SlackBuild
@@ -70,7 +70,7 @@ find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
 
 SHLIB_LD="gcc -shared -Wl,-s" \
 LDFLAGS="-Wl,-s" \
-CFLAGS="$SLKCFLAGS -fcommon" \
+CFLAGS="$SLKCFLAGS -fcommon -fpermissive" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/network/curl-quic/curl-quic.SlackBuild b/network/curl-quic/curl-quic.SlackBuild
index d262f7f9e8e..635b8715c7d 100644
--- a/network/curl-quic/curl-quic.SlackBuild
+++ b/network/curl-quic/curl-quic.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=curl-quic
 TGZNAM=curl
-VERSION=${VERSION:-8.6.0}
+VERSION=${VERSION:-8.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
diff --git a/network/curl-quic/curl-quic.info b/network/curl-quic/curl-quic.info
index fb673d34679..6158587a3d6 100644
--- a/network/curl-quic/curl-quic.info
+++ b/network/curl-quic/curl-quic.info
@@ -1,8 +1,8 @@
 PRGNAM="curl-quic"
-VERSION="8.6.0"
+VERSION="8.10.1"
 HOMEPAGE="https://curl.se/"
-DOWNLOAD="https://github.com/curl/curl/releases/download/curl-8_6_0/curl-8.6.0.tar.gz"
-MD5SUM="6178ea567611c2aaffafc88f91fb4238"
+DOWNLOAD="https://github.com/curl/curl/releases/download/curl-8_10_1/curl-8.10.1.tar.gz"
+MD5SUM="94480849689e8b5dd41017a98e253544"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="nghttp3 ngtcp2"
diff --git a/network/insync/insync.SlackBuild b/network/insync/insync.SlackBuild
index 095a34145f8..fa3d027b301 100644
--- a/network/insync/insync.SlackBuild
+++ b/network/insync/insync.SlackBuild
@@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=insync
 DEBNAM=xenial
-VERSION=${VERSION:-3.3.9.40955}
+VERSION=${VERSION:-3.9.0.60000}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
diff --git a/network/insync/insync.info b/network/insync/insync.info
index b6e0dbcf743..a0711e83d12 100644
--- a/network/insync/insync.info
+++ b/network/insync/insync.info
@@ -1,10 +1,10 @@
 PRGNAM="insync"
-VERSION="3.3.9.40955"
+VERSION="3.9.0.60000"
 HOMEPAGE="https://www.insynchq.com/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://slackware.uk/sbosrcarch/by-name/network/insync/insync_3.3.9.40955-xenial_amd64.deb"
-MD5SUM_x86_64="fd8ea3caaea11d4583e3a3f53876ac95"
+DOWNLOAD_x86_64="https://cdn.insynchq.com/builds/linux/3.9.0.60000/insync_3.9.0.60000-noble_amd64.deb"
+MD5SUM_x86_64="58aa02575a3579f1ce316328402712e3"
 REQUIRES=""
 MAINTAINER="Pedro R.M. Júnior"
 EMAIL="pedrormjunior@gmail.com"
diff --git a/network/memcached/memcached.SlackBuild b/network/memcached/memcached.SlackBuild
index 95bdb8ed759..533afa9bb4a 100644
--- a/network/memcached/memcached.SlackBuild
+++ b/network/memcached/memcached.SlackBuild
@@ -92,7 +92,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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=array-bounds" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/network/mosh/1282.patch b/network/mosh/1282.patch
deleted file mode 100644
index c8376a2c129..00000000000
--- a/network/mosh/1282.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 8012ca9c8d16f99679c171b36ad02655549ab7ff Mon Sep 17 00:00:00 2001
-From: Alex Chernyakhovsky 
-Date: Sun, 30 Jul 2023 16:19:46 -0400
-Subject: [PATCH] Bump C++ version to C++17
-
-Protobuf versions since 3.6.0 have long had a C++11 dependency; even
-more recent versions have picked up an Abseil dependency bumping that
-to C++14. Since it is now 2023, defaulting to C++17 is reasonable, so
-remove the conditional C++ standards version check that mosh
-previously had and replace it with an unconditional C++17 check.
-
-This means that all future commits can use C++17 features. According
-to https://en.cppreference.com/w/cpp/compiler_support/17 this means
-that minimum effective compiler versions for mosh become:
-
-gcc 7 (May 2017)
-clang 5 (September 2017)
-
-This, in turn, implies that future versions of mosh will no longer be
-available for RHEL/CentOS 7 (June 2014).
-
-Closes: #1267
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ee70c7b86..7f7dc3bc2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,9 +22,9 @@ AS_IF([test x"$PROTOC" = x],
- # automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
- m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
- 
--# Protobuf 3.6+ requires C++11.
--AS_IF([pkg-config --atleast-version 3.6.0 protobuf],
--  [AX_CXX_COMPILE_STDCXX([11])])
-+# Protobuf transitively requires at least C++14, get ahead of the
-+# curve and require at least C++17.
-+AX_CXX_COMPILE_STDCXX([17])
- 
- WARNING_CXXFLAGS=""
- PICKY_CXXFLAGS=""
diff --git a/network/mosh/README b/network/mosh/README
deleted file mode 100644
index 8b1944f8d5e..00000000000
--- a/network/mosh/README
+++ /dev/null
@@ -1,18 +0,0 @@
-mosh (MObile SHell server and client)
-
-Mosh is a remote terminal application that allows roaming, supports
-intermittent connectivity, and provides intelligent local echo and
-line editing of user keystrokes.
-
-Mosh attempts to improve on SSH by being more robust and responsive,
-especially over Wi-Fi, cellular, and long-distance links.
-
-The mosh client must be run with a UTF-8 locale. Locales
-can be configured system-wide in /etc/profile.d/lang.sh or
-/etc/profile.d/lang.csh
-
-Alternatively set LANG to a UTF-8 locale (e.g. LANG=en_GB.UTF-8)
-somewhere else you consider suitable.
-
-Additionally the server that you are connecting to must have the same
-locale installed (though it need not be set as the default).
diff --git a/network/mosh/mosh.SlackBuild b/network/mosh/mosh.SlackBuild
deleted file mode 100644
index 8127e0ff4d8..00000000000
--- a/network/mosh/mosh.SlackBuild
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for mosh
-
-# Written by ruario
-# Formerly maintained by Donald Cooley, South Haven, Indiana, USA
-# Now maintained by B. Watson .
-# Original script had no license; modified version licensed under
-# the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-
-# 20230225 bkw: homepage/download changed.
-
-# 20220425 bkw: BUILD=2
-# - take over maintenance.
-# - relicense script as WTFPL.
-# - include a couple more doc files (THANKS and ocb-license.html).
-# - add bash completion to package.
-# - add ufw integration to package (untested; I don't run ufw).
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=mosh
-VERSION=${VERSION:-1.4.0}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-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 /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-# patch to work with newer protobuf3
-patch -p1 < $CWD/1282.patch
-
-autoreconf -vif
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -fpermissive" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
-gzip -9 $PKG/usr/man/man*/*
-
-install -D -m0644 \
-  conf/bash-completion/completions/$PRGNAM \
-  $PKG/usr/share/bash-completion/completions/$PRGNAM
-
-install -D -m0644 \
-  conf/ufw/applications.d/$PRGNAM \
-  $PKG/etc/ufw/applications.d/$PRGNAM
-
-PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
-mkdir -p $PKGDOC
-cp -a AUTHORS COPYING ChangeLog NEWS *.md *.html THANKS $PKGDOC
-cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$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
diff --git a/network/mosh/mosh.info b/network/mosh/mosh.info
deleted file mode 100644
index abec8c93be3..00000000000
--- a/network/mosh/mosh.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="mosh"
-VERSION="1.4.0"
-HOMEPAGE="https://mosh.org"
-DOWNLOAD="https://github.com/mobile-shell/mosh/releases/download/mosh-1.4.0/mosh-1.4.0.tar.gz"
-MD5SUM="c34a647f8545565d79188acacaea7559"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="perl-IO-Tty protobuf3"
-MAINTAINER="B. Watson"
-EMAIL="urchlay@slackware.uk"
diff --git a/network/mosh/slack-desc b/network/mosh/slack-desc
deleted file mode 100644
index 077b45efd63..00000000000
--- a/network/mosh/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------------------------------------------------------|
-mosh: mosh (MObile SHell server and client)
-mosh:
-mosh: Remote terminal application that allows roaming, supports intermittent
-mosh: connectivity, and provides intelligent local echo and line editing of
-mosh: user keystrokes.
-mosh:
-mosh: Mosh attempts to improve on SSH by being more robust and responsive,
-mosh: especially over Wi-Fi, cellular, and long-distance links.
-mosh:
-mosh: http://mosh.mit.edu/
-mosh:
diff --git a/network/ngrep/ngrep-1.47-regex.patch b/network/ngrep/ngrep-1.47-regex.patch
new file mode 100644
index 00000000000..613643cf0e6
--- /dev/null
+++ b/network/ngrep/ngrep-1.47-regex.patch
@@ -0,0 +1,29 @@
+--- a/configure.in
++++ b/configure.in
+@@ -6,6 +6,7 @@
+ dnl NOTE: configure.in requires autoconf 2.57 or more recent.
+ 
+ AC_INIT(ngrep.c)
++AC_CONFIG_SUBDIRS([regex-0.12])
+ 
+ AC_MSG_RESULT
+ AC_MSG_RESULT(Configuring System ...)
+--- a/regex-0.12/Makefile.in
++++ b/regex-0.12/Makefile.in
+@@ -26,13 +26,13 @@
+ #   -DEXTRACT_MACROS to use the macros EXTRACT_* (as opposed to
+ #           the corresponding C procedures).  If not -DDEBUG, the macros
+ #           are used.
+-CPPFLAGS = 
++CPPFLAGS ?= 
+ 
+ # Likewise, you can override CFLAGS to optimize, use -Wall, etc.
+-CFLAGS = -g
++CFLAGS ?= -g
+ 
+ # Ditto for LDFLAGS and LOADLIBES.
+-LDFLAGS =
++LDFLAGS ?=
+ LOADLIBES =
+ 
+ srcdir = @srcdir@
diff --git a/network/ngrep/ngrep.SlackBuild b/network/ngrep/ngrep.SlackBuild
index 84422910d08..66475852611 100644
--- a/network/ngrep/ngrep.SlackBuild
+++ b/network/ngrep/ngrep.SlackBuild
@@ -82,6 +82,9 @@ 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/ngrep-1.47-regex.patch
+autoreconf -vif
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/network/offlineimap/offlineimap.info b/network/offlineimap/offlineimap.info
index 6aabd7cdaa2..7153df9c5c2 100644
--- a/network/offlineimap/offlineimap.info
+++ b/network/offlineimap/offlineimap.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/OfflineIMAP/offlineimap/archive/v7.3.4/offlineimap-
 MD5SUM="4494e696fc20a49db4e4a90f252df2c4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="rfc6555"
+REQUIRES="rfc6555 python2-six"
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
diff --git a/network/remmina/remmina.SlackBuild b/network/remmina/remmina.SlackBuild
index 7100e30948f..434e0669a5e 100644
--- a/network/remmina/remmina.SlackBuild
+++ b/network/remmina/remmina.SlackBuild
@@ -28,12 +28,12 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=remmina
-VERSION=${VERSION:-1.4.33}
+VERSION=${VERSION:-1.4.35}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-DIRNAME=Remmina-v.$VERSION
+DIRNAME=Remmina-v$VERSION
 
 AVAHI=${AVAHI:-OFF}
 KWALLET=${KWALLET:-ON}
diff --git a/network/remmina/remmina.info b/network/remmina/remmina.info
index 8fa24fb0640..b6d1d695454 100644
--- a/network/remmina/remmina.info
+++ b/network/remmina/remmina.info
@@ -1,8 +1,8 @@
 PRGNAM="remmina"
-VERSION="1.4.33"
+VERSION="1.4.35"
 HOMEPAGE="https://www.remmina.org"
-DOWNLOAD="https://gitlab.com/Remmina/Remmina/-/archive/v.1.4.33/Remmina-v.1.4.33.tar.bz2"
-MD5SUM="e3f0be9198e826938223c0e0ef402837"
+DOWNLOAD="https://gitlab.com/Remmina/Remmina/-/archive/v1.4.35/Remmina-v1.4.35.tar.bz2"
+MD5SUM="f655881007cc55db30518b9bfcae5ec4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="spice-gtk"
diff --git a/network/sqlmap/sqlmap.SlackBuild b/network/sqlmap/sqlmap.SlackBuild
index 20dc25a8ae2..20d7cd4ff9c 100644
--- a/network/sqlmap/sqlmap.SlackBuild
+++ b/network/sqlmap/sqlmap.SlackBuild
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=sqlmap
-VERSION=${VERSION:-1.4.9}
+VERSION=${VERSION:-1.8.7}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/network/sqlmap/sqlmap.info b/network/sqlmap/sqlmap.info
index 2d9ff51976a..c271d6be43c 100644
--- a/network/sqlmap/sqlmap.info
+++ b/network/sqlmap/sqlmap.info
@@ -1,8 +1,8 @@
 PRGNAM="sqlmap"
-VERSION="1.4.9"
+VERSION="1.8.7"
 HOMEPAGE="http://sqlmap.org/"
-DOWNLOAD="https://github.com/sqlmapproject/sqlmap/archive/1.4.9/sqlmap-1.4.9.tar.gz"
-MD5SUM="f79dac9b60f40ccdb4e1a05797b7cdc6"
+DOWNLOAD="https://github.com/sqlmapproject/sqlmap/archive/1.8.7/sqlmap-1.8.7.tar.gz"
+MD5SUM="874be44facc1e375a61812512c4e2422"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/sylpheed/sylpheed-3.7.0-types.patch b/network/sylpheed/sylpheed-3.7.0-types.patch
new file mode 100644
index 00000000000..4270793b347
--- /dev/null
+++ b/network/sylpheed/sylpheed-3.7.0-types.patch
@@ -0,0 +1,201 @@
+From 1bff4a0727c3e9e33418965205b127b956e7717e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= 
+Date: Sat, 27 Jan 2024 13:30:59 +0100
+Subject: [PATCH 1/4] fix incompatible pointer warnings
+
+---
+ libsylph/utils.c | 8 ++++----
+ libsylph/utils.h | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/libsylph/utils.c b/libsylph/utils.c
+index aabce066..7a9d1b61 100644
+--- a/libsylph/utils.c
++++ b/libsylph/utils.c
+@@ -4047,7 +4047,7 @@ static gchar **argv_utf8_to_locale(gchar **argv)
+ }
+ #endif
+ 
+-gint execute_async(gchar *const argv[])
++gint execute_async(gchar * argv[])
+ {
+ #if defined(G_OS_WIN32) && !GLIB_CHECK_VERSION(2, 8, 2)
+ 	gchar **cp_argv;
+@@ -4077,7 +4077,7 @@ gint execute_async(gchar *const argv[])
+ 	return 0;
+ }
+ 
+-gint execute_sync(gchar *const argv[])
++gint execute_sync(gchar * argv[])
+ {
+ 	gint status;
+ #if defined(G_OS_WIN32) && !GLIB_CHECK_VERSION(2, 8, 2)
+@@ -4247,7 +4247,7 @@ gint execute_open_file(const gchar *file, const gchar *content_type)
+ 		return 0;
+ 	}
+ #elif defined(__APPLE__)
+-	const gchar *argv[3] = {"open", NULL, NULL};
++	gchar *argv[3] = {"open", NULL, NULL};
+ 
+ 	g_return_val_if_fail(file != NULL, -1);
+ 
+@@ -4256,7 +4256,7 @@ gint execute_open_file(const gchar *file, const gchar *content_type)
+ 	argv[1] = file;
+ 	execute_async(argv);
+ #else
+-	const gchar *argv[3] = {"xdg-open", NULL, NULL};
++	gchar *argv[3] = {"xdg-open", NULL, NULL};
+ 
+ 	g_return_val_if_fail(file != NULL, -1);
+ 
+diff --git a/libsylph/utils.h b/libsylph/utils.h
+index 9ac65cf4..97496049 100644
+--- a/libsylph/utils.h
++++ b/libsylph/utils.h
+@@ -513,8 +513,8 @@ gchar *file_read_to_str		(const gchar	*file);
+ gchar *file_read_stream_to_str	(FILE		*fp);
+ 
+ /* process execution */
+-gint execute_async		(gchar *const	 argv[]);
+-gint execute_sync		(gchar *const	 argv[]);
++gint execute_async		(gchar *	 argv[]);
++gint execute_sync		(gchar *	 argv[]);
+ gint execute_command_line	(const gchar	*cmdline,
+ 				 gboolean	 async);
+ gint execute_command_line_async_wait
+-- 
+2.43.0
+
+
+From 1ae0b7e973e5da02190cfd5aeb145e6604af1e37 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= 
+Date: Sat, 27 Jan 2024 13:31:38 +0100
+Subject: [PATCH 2/4] fix pointer to int cast
+
+---
+ libsylph/account.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsylph/account.c b/libsylph/account.c
+index 2431bf3d..7067af3d 100644
+--- a/libsylph/account.c
++++ b/libsylph/account.c
+@@ -276,7 +276,7 @@ gboolean account_address_exist(const gchar *address)
+ 		}
+ 	}
+ 
+-	return (gboolean)g_hash_table_lookup(address_table, address);
++	return g_hash_table_lookup(address_table, address) != NULL;
+ }
+ 
+ void account_foreach(AccountFunc func, gpointer user_data)
+-- 
+2.43.0
+
+
+From 5427f4108a08c32869af0a3b56f13cb8a545fc7f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= 
+Date: Sat, 27 Jan 2024 13:32:13 +0100
+Subject: [PATCH 3/4] fix format for size_t argument
+
+---
+ libsylph/codeconv.c | 2 +-
+ libsylph/procmime.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libsylph/codeconv.c b/libsylph/codeconv.c
+index 49d1b3d3..6cad90d5 100644
+--- a/libsylph/codeconv.c
++++ b/libsylph/codeconv.c
+@@ -2722,7 +2722,7 @@ CharSet conv_check_file_encoding(const gchar *file)
+ 	if ((size = fread(buf, 2, BUFFSIZE / 2, fp)) > 0) {
+ 		CharSet guess_enc = C_AUTO;
+ 
+-		debug_print("conv_check_file_encoding: check first %d bytes of file %s\n", size * 2, file);
++		debug_print("conv_check_file_encoding: check first %zd bytes of file %s\n", size * 2, file);
+ 
+ 		/* BOM check */
+ 		if ((buf[0] & 0xff) == 0xfe && (buf[1] & 0xff) == 0xff) {
+diff --git a/libsylph/procmime.c b/libsylph/procmime.c
+index 4c3a90c6..0c101920 100644
+--- a/libsylph/procmime.c
++++ b/libsylph/procmime.c
+@@ -1890,7 +1890,7 @@ EncodingType procmime_get_encoding_for_text_file(const gchar *file)
+ 		octet_percentage = 0.0;
+ 
+ 	debug_print("procmime_get_encoding_for_text_file(): "
+-		    "8bit chars: %d / %d (%f%%)\n", octet_chars, total_len,
++		    "8bit chars: %zd / %zd (%f%%)\n", octet_chars, total_len,
+ 		    100.0 * octet_percentage);
+ 
+ 	if (octet_percentage > 0.20) {
+@@ -1926,7 +1926,7 @@ EncodingType procmime_get_encoding_for_str(const gchar *str)
+ 		octet_percentage = 0.0;
+ 
+ 	debug_print("procmime_get_encoding_for_str(): "
+-		    "8bit chars: %d / %d (%f%%)\n", octet_chars, total_len,
++		    "8bit chars: %zd / %zd (%f%%)\n", octet_chars, total_len,
+ 		    100.0 * octet_percentage);
+ 
+ 	if (octet_percentage > 0.20) {
+-- 
+2.43.0
+
+
+From 7aba8dcfe69ed08b3484464d8424ef16220d792c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= 
+Date: Sat, 27 Jan 2024 14:26:33 +0100
+Subject: [PATCH 4/4] fix format for glib types
+
+---
+ libsylph/filter.c | 4 ++--
+ libsylph/folder.c | 2 +-
+ libsylph/pop.c    | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libsylph/filter.c b/libsylph/filter.c
+index c58f8fc9..9607ccfb 100644
+--- a/libsylph/filter.c
++++ b/libsylph/filter.c
+@@ -566,10 +566,10 @@ static gboolean filter_match_cond(FilterCond *cond, MsgInfo *msginfo,
+ 			debug_print("filter-log: %s: CMD_TEST, str_value: [%s]%s\n", G_STRFUNC, sv, nm);
+ 			break;
+ 		case FLT_COND_SIZE_GREATER:
+-			debug_print("filter-log: %s: SIZE_GREATER: %u %s %d (KB)%s\n", G_STRFUNC, msginfo->size, not_match ? "<=" : ">", cond->int_value, nm);
++			debug_print("filter-log: %s: SIZE_GREATER: %" G_GSIZE_FORMAT " %s %d (KB)%s\n", G_STRFUNC, msginfo->size, not_match ? "<=" : ">", cond->int_value, nm);
+ 			break;
+ 		case FLT_COND_AGE_GREATER:
+-			debug_print("filter-log: %s: AGE_GREATER: %lld (sec) %s %d (day)%s\n", G_STRFUNC, timediff, not_match ? "<=" : ">", cond->int_value, nm);
++			debug_print("filter-log: %s: AGE_GREATER: %" G_GINT64_FORMAT " (sec) %s %d (day)%s\n", G_STRFUNC, timediff, not_match ? "<=" : ">", cond->int_value, nm);
+ 			break;
+ 		case FLT_COND_UNREAD:
+ 			debug_print("filter-log: %s: UNREAD%s\n", G_STRFUNC, nm);
+diff --git a/libsylph/folder.c b/libsylph/folder.c
+index 6fffe2dc..c1487e11 100644
+--- a/libsylph/folder.c
++++ b/libsylph/folder.c
+@@ -1945,7 +1945,7 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
+ 		}
+ 
+ 		fprintf(fp,
+-			" mtime=\"%lld\" new=\"%d\" unread=\"%d\" total=\"%d\"",
++			" mtime=\"%" G_GINT64_FORMAT "\" new=\"%d\" unread=\"%d\" total=\"%d\"",
+ 			(gint64)item->mtime, item->new, item->unread, item->total);
+ 
+ 		if (item->account)
+diff --git a/libsylph/pop.c b/libsylph/pop.c
+index 8cb7f5cb..7108b7a6 100644
+--- a/libsylph/pop.c
++++ b/libsylph/pop.c
+@@ -195,7 +195,7 @@ gint pop3_getrange_stat_send(Pop3Session *session)
+ 
+ gint pop3_getrange_stat_recv(Pop3Session *session, const gchar *msg)
+ {
+-	if (sscanf(msg, "%d %lld", &session->count, &session->total_bytes) != 2) {
++	if (sscanf(msg, "%d %" G_GINT64_FORMAT "", &session->count, &session->total_bytes) != 2) {
+ 		log_warning(_("POP3 protocol error\n"));
+ 		session->error_val = PS_PROTOCOL;
+ 		return PS_PROTOCOL;
+-- 
+2.43.0
+
diff --git a/network/sylpheed/sylpheed.SlackBuild b/network/sylpheed/sylpheed.SlackBuild
index eb0b55c8cd9..14b4e41f72d 100644
--- a/network/sylpheed/sylpheed.SlackBuild
+++ b/network/sylpheed/sylpheed.SlackBuild
@@ -40,9 +40,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -84,6 +81,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+patch -p1 < $CWD/sylpheed-3.7.0-types.patch
+
 # Thanks to archlinux!
 sed -i 's|enchant/|enchant-2/|g' src/compose.c
 sed -i 's| enchant| enchant-2|g' configure
diff --git a/network/tokodon/README b/network/tokodon/README
deleted file mode 100644
index d84bd1b3a30..00000000000
--- a/network/tokodon/README
+++ /dev/null
@@ -1,8 +0,0 @@
-tokodon (Mastodon client for Plasma and Plasma Mobile)
-
-A modern client for Mastodon and other decentralized servers that
-implement its API (such as Pixelfed).
-
-NOTE: This is the latest supported version for Slackware 15.0 unless
-libraries/kirigami-addons can be updated, which requires Plasma
-Framework in Slackware to be updated to 5.91 or higher.
diff --git a/network/tokodon/doinst.sh b/network/tokodon/doinst.sh
deleted file mode 100644
index 65c7e2eeb9a..00000000000
--- a/network/tokodon/doinst.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
diff --git a/network/tokodon/slack-desc b/network/tokodon/slack-desc
deleted file mode 100644
index 18a81c984d9..00000000000
--- a/network/tokodon/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------------------------------------------------------|
-tokodon: tokodon (Mastodon client for Plasma and Plasma Mobile)
-tokodon:
-tokodon: A modern client for Mastodon and other decentralized servers that
-tokodon: implement its API (such as Pixelfed).
-tokodon:
-tokodon: HOMEPAGE: https://github.com/KDE/tokodon
-tokodon:
-tokodon:
-tokodon:
-tokodon:
-tokodon:
diff --git a/network/tokodon/tokodon.SlackBuild b/network/tokodon/tokodon.SlackBuild
deleted file mode 100644
index 4de5ded0793..00000000000
--- a/network/tokodon/tokodon.SlackBuild
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for tokodon
-
-# Copyright 2023 Jeremy Hansen 
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=tokodon
-VERSION=${VERSION:-22.09}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-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 {} \;
-
-#
-sed -i 's|KWindowSystem::updateStartupId(view);|view->show();|' src/main.cpp
-sed -i 's|KWindowSystem::activateWindow(view)|view->raise();|' src/main.cpp
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKDE_INSTALL_LIBDIR=${LIBDIRSUFFIX} \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install/strip DESTDIR=$PKG
-cd ..
-
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-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
-cp -a \
-  README.md \
-  $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
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/tokodon/tokodon.info b/network/tokodon/tokodon.info
deleted file mode 100644
index 036bc822741..00000000000
--- a/network/tokodon/tokodon.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="tokodon"
-VERSION="22.09"
-HOMEPAGE="https://github.com/KDE/tokodon"
-DOWNLOAD="https://github.com/KDE/tokodon/archive/refs/tags/v22.09/tokodon-22.09.tar.gz"
-MD5SUM="71c1826bb9a6d0c5f042d46613c1f594"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="kirigami-addons"
-MAINTAINER="Jeremy Hansen"
-EMAIL="jebrhansen+SBo@gmail.com"
diff --git a/network/urlview/patches/Link-against-libncursesw-setlocale-LC_ALL.patch b/network/urlview/patches/Link-against-libncursesw-setlocale-LC_ALL.patch
new file mode 100644
index 00000000000..0c0e4f244f3
--- /dev/null
+++ b/network/urlview/patches/Link-against-libncursesw-setlocale-LC_ALL.patch
@@ -0,0 +1,49 @@
+From: nabijaczleweli@nabijaczleweli.xyz
+Date: Wed, 17 Aug 2022 22:33:38 +0200
+Subject: Link against libncursesw, setlocale(LC_ALL, "")
+
+On https://example.com/a” (i.e. a fancy quote), urlview with
+narrow-character curses makes an absolute hash of it, by writing it as:
+  https://example.com/a�~@~]
+
+When linked against the wide-character ncurses, it displays it exactly
+as expected, in the original form.
+---
+diff --git a/configure.in b/configure.in
+index 45e4e89..7f5be5c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -24,10 +24,10 @@ AC_ARG_WITH(slang, [  --with-slang[=DIR]      use S-Lang instead of curses],
+ 		LIBS="$LIBS -lslang -lm"
+ 	fi],
+ 
+-	[AC_CHECK_LIB(ncurses, initscr, [LIBS="$LIBS -lncurses"], [LIBS="$LIBS -lcurses"])
++	[AC_CHECK_LIB(ncursesw, initscr, [LIBS="$LIBS -lncursesw"], [LIBS="$LIBS -lcurses"])
+ 	AC_CHECK_FUNCS(curs_set)
+ 	AC_CHECK_HEADERS(ncurses.h)
+-	AC_CHECK_HEADER(ncurses/curses.h, [CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"])])
++	AC_CHECK_HEADER(ncursesw/curses.h, [CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"])])
+ 
+ AC_REPLACE_FUNCS(snprintf)
+ 
+diff --git a/urlview.c b/urlview.c
+index 7416dfc..b0861bd 100644
+--- a/urlview.c
++++ b/urlview.c
+@@ -32,6 +32,7 @@
+ #endif /* USE_SLANG */
+ 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -146,6 +147,8 @@ void search_backward (char *search, int urlcount, char **url, int *redraw, int *
+  
+ int main (int argc, char **argv)
+ {
++  setlocale(LC_ALL, "");
++
+   struct passwd *pw;
+   struct stat stat_buf;
+ #ifndef USE_SLANG
diff --git a/network/urlview/patches/invoke-AM_INIT_AUTOMAKE-with-foreign.patch b/network/urlview/patches/invoke-AM_INIT_AUTOMAKE-with-foreign.patch
new file mode 100644
index 00000000000..b00b879c8a6
--- /dev/null
+++ b/network/urlview/patches/invoke-AM_INIT_AUTOMAKE-with-foreign.patch
@@ -0,0 +1,21 @@
+From: Emanuele Rocca 
+Date: Thu, 16 Sep 2021 12:33:54 +0200
+Subject: configure.in: invoke AM_INIT_AUTOMAKE with "foreign"
+
+---
+ configure.in | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index ddd8043..45e4e89 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1,5 +1,6 @@
+-AC_INIT(urlview.c)
+-AM_INIT_AUTOMAKE(urlview, 0.9)
++AC_INIT([urlview], [0.9])
++AC_CONFIG_SRCDIR([urlview.c])
++AM_INIT_AUTOMAKE([foreign])
+ dnl AM_CONFIG_HEADER(config.h)
+ AM_PROG_CC_STDC
+ CFLAGS="$CFLAGS -DURLVIEW -Dunix"
diff --git a/network/urlview/urlview.SlackBuild b/network/urlview/urlview.SlackBuild
index c85b2b77c6d..324c6243f8f 100644
--- a/network/urlview/urlview.SlackBuild
+++ b/network/urlview/urlview.SlackBuild
@@ -66,6 +66,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -80,9 +82,10 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Apply patches for DESTDIR and mostly path fixes:
-for i in $CWD/patches/*.diff; do
-  patch -p0 < $i || exit 1
-done
+for i in $CWD/patches/*.diff; do patch -p0 < $i ; done
+for i in $CWD/patches/*.patch; do patch -p1 < $i ; done
+
+autoreconf -vif
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -96,8 +99,8 @@ make install DESTDIR=$PKG
 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
 
-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
+gzip -c9 urlview.man > $PKG/usr/man/man1/$PRGNAM.1.gz
 
 # Use sample.urlview as system-wide default configuration:
 install -D -m 0644 sample.urlview $PKG/etc/urlview.conf.new
diff --git a/network/vde2/rc.vde2 b/network/vde2/rc.vde2
index 9cc1beceb06..2d648c7a97d 100644
--- a/network/vde2/rc.vde2
+++ b/network/vde2/rc.vde2
@@ -33,7 +33,7 @@ start(){
    chmod -R a+rwx /var/run/vde.ctl
 
    # Apply workaround
-   echo 1024 > /proc/sys/dev/rtc/max-user-freq
+   echo 1024 > /sys/class/rtc/rtc0/max_user_freq
    echo
 }
 
diff --git a/network/vde2/vde2.SlackBuild b/network/vde2/vde2.SlackBuild
index 938256d74ca..16da4705e1c 100644
--- a/network/vde2/vde2.SlackBuild
+++ b/network/vde2/vde2.SlackBuild
@@ -27,8 +27,9 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=vde2
-VERSION=${VERSION:-2.3.2}
-BUILD=${BUILD:-2}
+SRCNAM=vde-2
+VERSION=${VERSION:-2.3.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -40,9 +41,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -71,9 +69,9 @@ 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 $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -81,9 +79,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 to build against openssl-1.1.x - thanks archlinux!
-patch -p1 < $CWD/vde_cryptcab-compile-against-openssl-1.1.0.patch
-
 EXPERIMENTAL=${EXPERIMENTAL:-false}
 OPTIONS=""
 
@@ -95,6 +90,8 @@ fi
 # a reminder:
 #  --enable-kernel-switch
 
+autoreconf -vif
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/network/vde2/vde2.info b/network/vde2/vde2.info
index 51d679f300f..884c62a3ff3 100644
--- a/network/vde2/vde2.info
+++ b/network/vde2/vde2.info
@@ -1,8 +1,8 @@
 PRGNAM="vde2"
-VERSION="2.3.2"
+VERSION="2.3.3"
 HOMEPAGE="http://vde.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/project/vde/vde2/2.3.2/vde2-2.3.2.tar.bz2"
-MD5SUM="46fbc5f97f03dc517aa3b2c9d9ea6628"
+DOWNLOAD="https://github.com/virtualsquare/vde-2/archive/v2.3.3/vde-2-2.3.3.tar.gz"
+MD5SUM="d73411e88975a9f7c9cb4c2b0ad32d15"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch b/network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch
deleted file mode 100644
index 227312eabbd..00000000000
--- a/network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/src/vde_cryptcab/cryptcab.c	2011-11-23 16:41:17.000000000 +0000
-+++ b/src/vde_cryptcab/cryptcab.c	2017-03-20 22:54:20.452975075 +0000
-@@ -22,7 +22,7 @@
- 	exit(1);
- }
- 	
--static EVP_CIPHER_CTX ctx;
-+static EVP_CIPHER_CTX *ctx;
- static int ctx_initialized = 0;
- static int encryption_disabled = 0;
- static int nfd;
-@@ -30,6 +30,10 @@
- static struct vde_open_args open_args={.port=0,.group=NULL,.mode=0700};
- static int verbose = 0;
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#define EVP_CIPHER_CTX_reset(x)	EVP_CIPHER_CTX_cleanup(x)
-+#endif
-+
- void vc_printlog(int priority, const char *format, ...)
- {
- 	va_list arg;
-@@ -103,19 +107,21 @@
- 	}
- 
- 	if (!ctx_initialized) {
--		EVP_CIPHER_CTX_init (&ctx);
-+		ctx = EVP_CIPHER_CTX_new ();
-+		if (!ctx)
-+			return -1;
- 		ctx_initialized = 1;
- 	}
- 	
--	EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
--	if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1)
-+	EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
-+	if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1)
- 	{
- 		fprintf (stderr,"error in encrypt update\n");
- 		olen = -1;
- 		goto cleanup;
- 	}
- 
--	if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1)
-+	if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1)
- 	{
- 		fprintf (stderr,"error in encrypt final\n");
- 		olen = -1;
-@@ -124,7 +130,7 @@
- 	olen += tlen;
- 
- cleanup:
--	EVP_CIPHER_CTX_cleanup(&ctx);	
-+	EVP_CIPHER_CTX_reset(ctx);
- 	return olen;
- }
- 
-@@ -138,19 +144,21 @@
- 	}
- 	
- 	if (!ctx_initialized) {
--		EVP_CIPHER_CTX_init (&ctx);
-+		ctx = EVP_CIPHER_CTX_new ();
-+		if (!ctx)
-+			return -1;
- 		ctx_initialized = 1;
- 	}
- 
--	EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
--	if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1)
-+	EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
-+	if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1)
- 	{
- 		fprintf (stderr,"error in decrypt update\n");
- 		olen = -1;
- 		goto cleanup;
- 	}
- 
--	if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1)
-+	if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1)
- 	{
- 		fprintf (stderr,"error in decrypt final\n");
- 		olen = -1;
-@@ -159,7 +167,7 @@
- 	olen += tlen;
- 
- cleanup:
--	EVP_CIPHER_CTX_cleanup(&ctx);	
-+	EVP_CIPHER_CTX_reset (ctx);
- 	return olen;
- }
- 
diff --git a/network/w3m/w3m.SlackBuild b/network/w3m/w3m.SlackBuild
index 022239d2ba7..b19dfbb6256 100644
--- a/network/w3m/w3m.SlackBuild
+++ b/network/w3m/w3m.SlackBuild
@@ -82,7 +82,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-[ -n "$NOMOUSE" ] && mouse="--disable-mouse"
+# This is disabled an gpm in current, as built, is not compatible
+#[ -n "$NOMOUSE" ] && mouse="--disable-mouse"
+mouse="--disable-mouse"
 [ -n "$NOMAILER" ] && mailer="--disable-w3mmailer"
 [ -n "$GUIBROWSER" ] && browser="--with-browser=$GUIBROWSER"
 [ -n "$EDITOR" ] && editor="--with-editor=$EDITOR"
diff --git a/network/weechat/weechat.SlackBuild b/network/weechat/weechat.SlackBuild
index e6a9684604b..766d0ee1dee 100644
--- a/network/weechat/weechat.SlackBuild
+++ b/network/weechat/weechat.SlackBuild
@@ -100,6 +100,8 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
+sed -i "s|ruby-3.2|ruby-3.3 ruby-3.2|" cmake/FindRuby.cmake
+
 # 20211019 bkw: patch from Debian: Build html documentation without
 # requiring data (javascript, fonts) on external websites (potential
 # privacy breach). Patch was slightly modified for Slackware.
diff --git a/network/wol/patches/wol-0.7.1-Fix-config.h-test-consumption.patch b/network/wol/patches/wol-0.7.1-Fix-config.h-test-consumption.patch
new file mode 100644
index 00000000000..897517a97f4
--- /dev/null
+++ b/network/wol/patches/wol-0.7.1-Fix-config.h-test-consumption.patch
@@ -0,0 +1,35 @@
+From 1c16d04a3fc03a5f4c0cd54ff6f207de1062e9bd Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Tue, 25 Oct 2022 13:54:04 +0100
+Subject: [PATCH] Fix config.h test consumption
+
+Bug: https://bugs.gentoo.org/874420
+--- a/lib/ether.h
++++ b/lib/ether.h
+@@ -35,7 +35,7 @@
+ 
+ #include "magic.h"
+ 
+-#if !HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET && !HAVE_STRUCT_ETHER_ADDR_OCTET
++#if !defined(HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET) && !defined(HAVE_STRUCT_ETHER_ADDR_OCTET)
+ 
+ struct
+ ether_addr
+@@ -45,7 +45,7 @@ ether_addr
+ 
+ #define ETHER_ADDR_OCTET ether_addr_octet
+ 
+-#else /* HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET || HAVE_STRUCT_ETHER_ADDR_OCTET */
++#else /* defined(HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET) || defined(HAVE_STRUCT_ETHER_ADDR_OCTET) */
+ 
+ #if HAVE_STRUCT_ETHER_ADDR_OCTET
+ #define ETHER_ADDR_OCTET octet
+@@ -55,7 +55,7 @@ ether_addr
+ #define ETHER_ADDR_OCTET ether_addr_octet
+ #endif /* HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET */
+ 
+-#endif /* !HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET && !HAVE_STRUCT_ETHER_ADDR_OCTET */
++#endif /* !defined(HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET) && !defined(HAVE_STRUCT_ETHER_ADDR_OCTET) */
+ 
+ 
+ #if !defined(HAVE_ETHER_HOSTTON)
diff --git a/network/wol/patches/wol-0.7.1-Fix-malloc-detection.patch b/network/wol/patches/wol-0.7.1-Fix-malloc-detection.patch
new file mode 100644
index 00000000000..6f783e9cfae
--- /dev/null
+++ b/network/wol/patches/wol-0.7.1-Fix-malloc-detection.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/874420
+
+From bcf98fe9a674a3784ad1a4f8eecc3b31a7b209a9 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Tue, 25 Oct 2022 14:00:23 +0100
+Subject: [PATCH] Fix malloc detection
+
+--- a/m4/getline.m4
++++ b/m4/getline.m4
+@@ -18,6 +18,7 @@ AC_DEFUN([AM_FUNC_GETLINE],
+ #    include 
+ #    include 
+ #    include 
++#    include 
+     int main ()
+     { /* Based on a test program from Karl Heuer.  */
+       char *line = NULL;
+--- a/m4/malloc.m4
++++ b/m4/malloc.m4
+@@ -14,6 +14,7 @@ AC_DEFUN([jm_FUNC_MALLOC],
+ 
+  AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc,
+   [AC_TRY_RUN([
++    #include 
+     char *malloc ();
+     int
+     main ()
+--- a/m4/realloc.m4
++++ b/m4/realloc.m4
+@@ -14,7 +14,8 @@ AC_DEFUN([jm_FUNC_REALLOC],
+ 
+  AC_CACHE_CHECK([for working realloc], jm_cv_func_working_realloc,
+   [AC_TRY_RUN([
+-    char *realloc ();
++    #include 
++    void *realloc(void *ptr, size_t size);
+     int
+     main ()
+     {
diff --git a/network/wol/patches/wol-0.7.1-linux-headers.patch b/network/wol/patches/wol-0.7.1-linux-headers.patch
new file mode 100644
index 00000000000..e381d2a31a6
--- /dev/null
+++ b/network/wol/patches/wol-0.7.1-linux-headers.patch
@@ -0,0 +1,11 @@
+--- a/src/magic.c
++++ b/src/magic.c
+@@ -142,7 +142,7 @@ magic_assemble (struct magic *magic_buf, const char *mac_str,
+ 				}
+ 
+ 			for (j = 0; j < MAC_LEN; ++j)
+-				m[j] = ea.ETHER_ADDR_OCTET[j];
++				m[j] = ea.ether_addr_octet[j];
+ 		}
+ 
+ 	/* accommodate the packet chunk's size to the packet type */
diff --git a/network/wol/wol.SlackBuild b/network/wol/wol.SlackBuild
index 0f41e2b8361..b0f485364c8 100644
--- a/network/wol/wol.SlackBuild
+++ b/network/wol/wol.SlackBuild
@@ -53,10 +53,15 @@ 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 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 {} \;
+
+# Apply patches from gentoo (thanks!)
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
+autoreconf -vif
+export jm_cv_func_working_{re,m}alloc=yes
 
 CFLAGS="$SLKCFLAGS" \
   ./configure \
@@ -65,18 +70,17 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --infodir=/usr/info \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-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 || exit 1
-  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
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
diff --git a/network/wsdd2/README b/network/wsdd2/README
deleted file mode 100644
index d164e3196af..00000000000
--- a/network/wsdd2/README
+++ /dev/null
@@ -1,34 +0,0 @@
-wsdd2 (WSD/LLMNR Discovery/Name Service Daemon)
-
-Provides samba share discovery for clients who don't support netbios
-or are running ip6 (which netbios does not support).
-This is based on the NETGEAR implimentation.
-
-NOTE: make sure you allow local ip6 connections in your samba config
-otherwise there will be no shares found. if you use "hosts allow"
-in smb.conf then add     fc00::/7 fe80::/64 ::1
-to the list of your local ip4 addresses so that local ip6 pcs can
-use your shares.
-
-NOTE2: The following ports/addresses also need to be open if you are
-using a firewall:
-tcp port 3702 (unicast), and
-udp ports 3702 ( multicast on ports 239.255.255.250 / ff02::c )
-tcp port 5355 (unicast), and
-udp on ports 224.0.0.252 / ff02::1:3  (multicast)
-
-to get wsdd2 to run automatically on startup add the following lines
-in /etc/rc.d/rc.local
-
-#start wsdd2 daemon if samba is configured
-if [ -x /etc/rc.d/rc.wsdd2 ]; then
-   /etc/rc.d/rc.wsdd2 start
-fi
-
-and to stop it on shutdown, add the following to
-samba section in /etc/rc.d/rc.local_shutdown
-
-#stop wsdd2 daemon
-if [ -x /etc/rc.d/rc.wsdd2 ]; then
-   /etc/rc.d/rc.wsdd2 stop
-fi
diff --git a/network/wsdd2/README.allowip6 b/network/wsdd2/README.allowip6
deleted file mode 100644
index 85009e93256..00000000000
--- a/network/wsdd2/README.allowip6
+++ /dev/null
@@ -1,17 +0,0 @@
-It may be obvious, but its easy to forget; to access samba shares
-using ip6 you need to allow ip6 addresses access to the server. If
-you want to limit access to local ip6 addresses and you are using
-the "hosts allow" option in smb.conf then add the following
-address/masks to the end of any ip4 addresses you alread have listed
-
- fc00::/7 fe80::/64 ::1
-
-this will allow link-local, unique-local, and local loop ip6 addresses
-
-Even if a machine has a public ip6 address, it will also have a
-link-local one for ip6 sublayer operations of the Neighbor Discovery
-Protocol as well as for some other protocols such as DHCPv6
-
-if you are using a firewall, don't forget to allow access to port
-5357 (tcp) and 3702 (udp) otherwise wsdd2 will not work.
-
diff --git a/network/wsdd2/doinst.sh b/network/wsdd2/doinst.sh
deleted file mode 100644
index 194630ea253..00000000000
--- a/network/wsdd2/doinst.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-    chmod +x $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-preserve_perms etc/rc.d/rc.wsdd2.new
diff --git a/network/wsdd2/rc.wsdd2 b/network/wsdd2/rc.wsdd2
deleted file mode 100644
index 1fcf58f9954..00000000000
--- a/network/wsdd2/rc.wsdd2
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-#
-# /etc/rc.d/rc.wsdd2
-#
-# start/stop/restart the wsdd2 daemon.
-#
-# To make wsdd2 start automatically at boot make sure this
-# file is executable, and add the following entry to rc.local
-# (uncommented)
-
-# if [ -x /etc/rc.d/rc.wsdd2 ]; then
-#   /etc/rc.d/rc.wsdd2 start
-# fi
-
-# you may also add the following entry to rc.local_shutdown
-# (uncommented)
-
-# if [ -x /etc/rc.d/rc.wsdd2 ]; then
-#   /etc/rc.d/rc.wsdd2 stop
-# fi
-
-wsdd2_start() {
-  if [ -r /etc/samba/smb.conf -a -x /etc/rc.d/rc.samba -a -x /usr/sbin/wsdd2 ]; then
-    echo "Starting wsdd2: /usr/bin/wsdd2 -d"
-    /usr/sbin/wsdd2 -d
-  elif [ ! -r /etc/samba/smb.conf ]; then
-    echo "ERROR: samba not configured, so wsdd2 has no service to advertise"
-  fi
-}
-wsdd2_stop() {
-  #check something is running before trying to kill it.
-  if [ "x`ps -A|grep ' wsdd2'|wc -l`" != "x0" ]; then
-    killall wsdd2
-  fi
-}
-wsdd2_restart() {
-  wsdd2_stop
-  sleep 1
-  wsdd2_start
-}
-case "$1" in
-'start')
-  #we don't want to run this more than once,
-  #so kill off any instance already running
-  wsdd2_stop
-  wsdd2_start
-  ;;
-'stop')
-  wsdd2_stop
-  ;;
-'restart')
-  wsdd2_restart
-  ;;
-*)
-  # default is start
-  wsdd2_start
-esac
-
diff --git a/network/wsdd2/slack-desc b/network/wsdd2/slack-desc
deleted file mode 100644
index 41cfbcc117d..00000000000
--- a/network/wsdd2/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------------------------------------------------------|
-wsdd2: wsdd2 (WSD/LLMNR Discovery/Name Service Daemon)
-wsdd2:
-wsdd2: Provides samba share browsing for clients who don't support netbios
-wsdd2: or are running ip6 (which netbios does not support).
-wsdd2: This is based on the NETGEAR implimentation.
-wsdd2:
-wsdd2: Don't forget to allow local ip6 connections in your smb.conf file,
-wsdd2: specifically,  fc00::/7 fe80::/64 ::1
-wsdd2: Also in your firewall, make sure ports 3702 and 5355 are open.
-wsdd2:
-wsdd2: Home Page https://github.com/Netgear/wsdd2
diff --git a/network/wsdd2/wsdd2.SlackBuild b/network/wsdd2/wsdd2.SlackBuild
deleted file mode 100644
index 072cf3d55d4..00000000000
--- a/network/wsdd2/wsdd2.SlackBuild
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for wsdd2
-
-# Copyright 2020,2022 Tim Dickson Scotland
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=wsdd2
-VERSION=${VERSION:-1.8.7}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-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 {} \;
-
-#we are going to have to fix Makefile as we don't want systemd stuff
-sed -i "/systemd/d" Makefile
-
-#patch the source to remove generally useless warning
-# ie. warning about missing (entirely optional) parameters in smb.conf
-patch wsdd2.c <${CWD}/wsdd2.patch
-#note: hopefully upstream will fix this. https://github.com/Netgear/wsdd2/issues/39
-
-make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
-make install debug_W=-1 debug_L=-1 DESTDIR=$PKG MANDIR="/usr/man" INSTALLPREFIX="usr"
-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
-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
-
-#copy over the rc file
-mkdir -p $PKG/etc/rc.d
-cp -a $CWD/rc.${PRGNAM} $PKG/etc/rc.d/rc.${PRGNAM}.new
-chown root:root $PKG/etc/rc.d/rc.${PRGNAM}.new
-# now for docs
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/README.allowip6 > $PKG/usr/doc/$PRGNAM-$VERSION/README.allowip6
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
-
diff --git a/network/wsdd2/wsdd2.info b/network/wsdd2/wsdd2.info
deleted file mode 100644
index a839c31ffe5..00000000000
--- a/network/wsdd2/wsdd2.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="wsdd2"
-VERSION="1.8.7"
-HOMEPAGE="https://github.com/Netgear/wsdd2"
-DOWNLOAD="https://github.com/Netgear/wsdd2/archive/1.8.7/wsdd2-1.8.7.tar.gz"
-MD5SUM="6f59c63f07c8f42f05469d8020c0a604"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Tim Dickson"
-EMAIL="dickson.tim@googlemail.com"
diff --git a/network/wsdd2/wsdd2.patch b/network/wsdd2/wsdd2.patch
deleted file mode 100644
index aec9c4baaa9..00000000000
--- a/network/wsdd2/wsdd2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- wsdd2.c	2021-08-09 20:22:46.000000000 +0100
-+++ wsdd2u.c	2022-04-22 11:22:12.125000000 +0100
-@@ -601,7 +601,7 @@
- 
- 	char buf[PAGE_SIZE];
- 	if (!fgets(buf, sizeof(buf), pp) || !buf[0]  || buf[0] == '\n') {
--		DEBUG(0, W, "cannot read %s from testparm", name);
-+		DEBUG(1, W, "cannot read %s from testparm", name);
- 		result = strdup(_default);
- 	} else { // trim whitespace
- 		char *p;
diff --git a/network/x2goclient/x2goclient.SlackBuild b/network/x2goclient/x2goclient.SlackBuild
index 8fb5f09e1a6..36a8377b56c 100644
--- a/network/x2goclient/x2goclient.SlackBuild
+++ b/network/x2goclient/x2goclient.SlackBuild
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=x2goclient
-VERSION=${VERSION:-4.1.2.2}
+VERSION=${VERSION:-4.1.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -71,7 +71,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -80,12 +80,11 @@ 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 {} \;
 
-# The newer libssh doesn't ship this library anymore
-[[ "$(pkg-config --modversion libssh)" > "0.8" ]] && \
-  sed -i "s| -lssh_threads||" x2goclient.pro
+sed -i '/^MAKEOVERRIDES\s*=/ s/=.*$/=/' Makefile
+sed -i '/^\.MAKEOVERRIDES\s*=/ s/=.*$/=/' Makefile
+sed -i '/^\.MAKEFLAGS\s*=/ s/=.*$/=/' Makefile
 
-sed -i -e '/^QMAKE_BINARY=/s@qmake-qt4@qmake@' Makefile
-sed -i -e '/^LRELEASE_BINARY=/s@lrelease-qt4@lrelease@' Makefile
+export QT_VERSION=5
 
 make
 
diff --git a/network/x2goclient/x2goclient.info b/network/x2goclient/x2goclient.info
index c360e03d0d7..67272c1ad6b 100644
--- a/network/x2goclient/x2goclient.info
+++ b/network/x2goclient/x2goclient.info
@@ -1,8 +1,8 @@
 PRGNAM="x2goclient"
-VERSION="4.1.2.2"
+VERSION="4.1.2.3"
 HOMEPAGE="http://www.x2go.org"
-DOWNLOAD="https://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.2.tar.gz"
-MD5SUM="1390b794b0a10f0a885dd7cf00f2acef"
+DOWNLOAD="https://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.3.tar.gz"
+MD5SUM="7af1dd74d2f36fc292944addcfebb3cc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="nx-libs"
diff --git a/network/x2goserver/x2goserver.SlackBuild b/network/x2goserver/x2goserver.SlackBuild
index caa42c4eaa2..10766d59a93 100644
--- a/network/x2goserver/x2goserver.SlackBuild
+++ b/network/x2goserver/x2goserver.SlackBuild
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=x2goserver
-VERSION=${VERSION:-20201227_08aa5e6}
+VERSION=${VERSION:-4.1.0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -71,7 +71,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/network/x2goserver/x2goserver.info b/network/x2goserver/x2goserver.info
index 7dfbf73d3a5..01a0704bb13 100644
--- a/network/x2goserver/x2goserver.info
+++ b/network/x2goserver/x2goserver.info
@@ -1,8 +1,8 @@
 PRGNAM="x2goserver"
-VERSION="20201227_08aa5e6"
+VERSION="4.1.0.5"
 HOMEPAGE="http://www.x2go.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/x2goserver-20201227_08aa5e6.tar.xz"
-MD5SUM="46aad829313b85218841e1f818244a06"
+DOWNLOAD="https://code.x2go.org/releases/source/x2goserver/x2goserver-4.1.0.5.tar.gz"
+MD5SUM="31d3031684d8fc782619270eb36ab58c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="nx-libs perl-Config-Simple perl-File-ReadBackwards perl-DBD-SQLite perl-Capture-Tiny perl-Try-Tiny perl-Unix-Syslog perl-file-basedir perl-Switch"
diff --git a/office/abiword/abiword.SlackBuild b/office/abiword/abiword.SlackBuild
index 3170bba6ec5..0c11e6d5e70 100644
--- a/office/abiword/abiword.SlackBuild
+++ b/office/abiword/abiword.SlackBuild
@@ -93,6 +93,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
+# https://www.linuxfromscratch.org/blfs/view/svn/xsoft/AbiWord.html
+sed -e '/libxml/a #include ' \
+    -i src/af/util/xp/ut_stringbuf.cpp
+
 patch -p1 < $CWD/enchant-2.1.patch
 
 # 20200622 bkw: don't let abiword create /root/.config/abiword/profile
@@ -102,7 +106,7 @@ export CCACHE_DIR=${CCACHE_DIR:-$HOME/.ccache}
 export HOME=$( pwd )/tmphome
 
 CPPFLAGS="-I$TMP/$PRGNAM-$VERSION" \
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fpermissive" \
 CXXFLAGS="$SLKCFLAGS -std=c++11" \
 ./autogen.sh \
   --prefix=/usr \
diff --git a/office/asymptote/asymptote.SlackBuild b/office/asymptote/asymptote.SlackBuild
index 3c9d7da6553..3a7ecea72e0 100644
--- a/office/asymptote/asymptote.SlackBuild
+++ b/office/asymptote/asymptote.SlackBuild
@@ -89,7 +89,7 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --enable-gc=system \
-  --enable-offscreen \
+  --disable-offscreen \
   --disable-lsp \
   --disable-gc-debug \
   --disable-gc-full-debug \
diff --git a/office/gnucash-docs/gnucash-docs.SlackBuild b/office/gnucash-docs/gnucash-docs.SlackBuild
index cab82e5ef06..fad6a714af0 100644
--- a/office/gnucash-docs/gnucash-docs.SlackBuild
+++ b/office/gnucash-docs/gnucash-docs.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gnucash-docs
-VERSION=${VERSION:-4.11}
+VERSION=${VERSION:-5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -91,15 +91,15 @@ cd build
     make $DOCLANG-gnucash-help-pdf || make C-gnucash-help-pdf
   fi
 
-  make install DESTDIR=$PKG
+  make -j1 install DESTDIR=$PKG
 
 # Move the files to where they belong:
   mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-  cp -Rv share/doc/$DOCLANG/* $PKG/usr/doc/$PRGNAM-$VERSION
+  cp -Rv share/help/$DOCLANG/* $PKG/usr/doc/$PRGNAM-$VERSION
   cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 # There is no help system for Japanese, so:
   if [ "$DOCLANG" = "ja" ]; then
-    cp -Rv share/doc/C/gnucash-help* $PKG/usr/doc/$PRGNAM-$VERSION
+    cp -Rv share/help/C/gnucash-help* $PKG/usr/doc/$PRGNAM-$VERSION
   fi
   mv $PKG/usr/share/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
 # get rid of unused folders:
diff --git a/office/gnucash-docs/gnucash-docs.info b/office/gnucash-docs/gnucash-docs.info
index b4ca5038df2..0f7b5ee92db 100644
--- a/office/gnucash-docs/gnucash-docs.info
+++ b/office/gnucash-docs/gnucash-docs.info
@@ -1,8 +1,8 @@
 PRGNAM="gnucash-docs"
-VERSION="4.11"
+VERSION="5.4"
 HOMEPAGE="https://www.gnucash.org"
-DOWNLOAD="https://downloads.sourceforge.net/gnucash/gnucash-docs-4.11.tar.gz"
-MD5SUM="4fd7d4e6cb5ef18fb3e54dc623dd76f6"
+DOWNLOAD="https://downloads.sourceforge.net/gnucash/gnucash-docs-5.4.tar.gz"
+MD5SUM="62b1a9cd78d9d9fff889c9460716bd5c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gnucash rarian yelp"
diff --git a/office/gnucash/gnucash.SlackBuild b/office/gnucash/gnucash.SlackBuild
index 683da1af55e..aeaee639fe6 100644
--- a/office/gnucash/gnucash.SlackBuild
+++ b/office/gnucash/gnucash.SlackBuild
@@ -26,8 +26,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gnucash
-VERSION=${VERSION:-4.11}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-5.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
diff --git a/office/gnucash/gnucash.info b/office/gnucash/gnucash.info
index 0f8546165a7..d337fd780c1 100644
--- a/office/gnucash/gnucash.info
+++ b/office/gnucash/gnucash.info
@@ -1,8 +1,8 @@
 PRGNAM="gnucash"
-VERSION="4.11"
+VERSION="5.4"
 HOMEPAGE="https://www.gnucash.org/"
-DOWNLOAD="https://downloads.sourceforge.net/gnucash/gnucash-4.11.tar.bz2"
-MD5SUM="e6ea5e80ea27f09115439fab881a0ad5"
+DOWNLOAD="https://downloads.sourceforge.net/gnucash/gnucash-5.4.tar.bz2"
+MD5SUM="d0d850eefe8a54e28a57ac37984158c0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="webkit2gtk gtest"
diff --git a/office/goldendict/ffmpeg7.patch b/office/goldendict/ffmpeg7.patch
new file mode 100644
index 00000000000..d952d9e2a0f
--- /dev/null
+++ b/office/goldendict/ffmpeg7.patch
@@ -0,0 +1,104 @@
+From 718462c5c1e2b6f3064f921c0800e45b8d5b84b8 Mon Sep 17 00:00:00 2001
+From: Liao Junxuan 
+Date: Fri, 28 Jun 2024 18:06:13 +0800
+Subject: [PATCH] add support for ffmpeg 7.0
+
+FF_API_OLD_CHANNEL_LAYOUT is removed in libavcodec 61.
+See https://patchwork.ffmpeg.org/project/ffmpeg/cover/20240125134425.374-1-jamrial@gmail.com/ .
+---
+ ffmpegaudio.cc | 33 ++++++++++++++++++++++++++++-----
+ 1 file changed, 28 insertions(+), 5 deletions(-)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index a97d6dcad..5ef602ad8 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -118,6 +118,13 @@ struct DecoderContext
+   bool play( QString & errorString );
+   bool normalizeAudio( AVFrame * frame, vector & samples );
+   void playFrame( AVFrame * frame );
++  int nbChannels() {
++#if LIBAVCODEC_VERSION_MAJOR >= 61
++    return codecContext_->ch_layout.nb_channels;
++#else
++    return codecContext_->channels;
++#endif
++  }
+ };
+ 
+ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCancelled ):
+@@ -261,7 +268,7 @@ bool DecoderContext::openCodec( QString & errorString )
+   }
+ 
+   gdDebug( "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
+-          codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
++          nbChannels(), codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
+ 
+   if ( codecContext_->sample_fmt == AV_SAMPLE_FMT_S32  ||
+        codecContext_->sample_fmt == AV_SAMPLE_FMT_S32P ||
+@@ -270,6 +277,21 @@ bool DecoderContext::openCodec( QString & errorString )
+        codecContext_->sample_fmt == AV_SAMPLE_FMT_DBL  ||
+        codecContext_->sample_fmt == AV_SAMPLE_FMT_DBLP )
+   {
++#if LIBAVCODEC_VERSION_MAJOR >= 61
++    int ret = swr_alloc_set_opts2( &swr_,
++        &codecContext_->ch_layout,
++        AV_SAMPLE_FMT_S16,
++        codecContext_->sample_rate,
++        &codecContext_->ch_layout,
++        codecContext_->sample_fmt,
++        codecContext_->sample_rate,
++        0,
++        NULL );
++    if ( ret < 0 ) {
++      errorString = QObject::tr( "swr_alloc_set_opts2() failed: %1." ).arg( avErrorString( ret ) );
++      return false;
++    }
++#else
+     swr_ = swr_alloc_set_opts( NULL,
+         codecContext_->channel_layout,
+         AV_SAMPLE_FMT_S16,
+@@ -279,6 +301,7 @@ bool DecoderContext::openCodec( QString & errorString )
+         codecContext_->sample_rate,
+         0,
+         NULL );
++#endif
+     swr_init( swr_ );
+   }
+ 
+@@ -351,7 +374,7 @@ bool DecoderContext::openOutputDevice( QString & errorString )
+ 
+   ao_sample_format aoSampleFormat;
+   memset (&aoSampleFormat, 0, sizeof(aoSampleFormat) );
+-  aoSampleFormat.channels = codecContext_->channels;
++  aoSampleFormat.channels = nbChannels();
+   aoSampleFormat.rate = codecContext_->sample_rate;
+   aoSampleFormat.byte_format = AO_FMT_NATIVE;
+   aoSampleFormat.matrix = 0;
+@@ -520,7 +543,7 @@ static inline int32_t toInt32( double v )
+ bool DecoderContext::normalizeAudio( AVFrame * frame, vector & samples )
+ {
+   int lineSize = 0;
+-  int dataSize = av_samples_get_buffer_size( &lineSize, codecContext_->channels,
++  int dataSize = av_samples_get_buffer_size( &lineSize, nbChannels(),
+                                              frame->nb_samples, codecContext_->sample_fmt, 1 );
+ 
+   // Portions from: https://code.google.com/p/lavfilters/source/browse/decoder/LAVAudio/LAVAudio.cpp
+@@ -542,7 +565,7 @@ bool DecoderContext::normalizeAudio( AVFrame * frame, vector & samples )
+       uint8_t * out = ( uint8_t * )&samples.front();
+       for ( int i = 0; i < frame->nb_samples; i++ )
+       {
+-        for ( int ch = 0; ch < codecContext_->channels; ch++ )
++        for ( int ch = 0; ch < nbChannels(); ch++ )
+         {
+           *out++ = ( ( uint8_t * )frame->extended_data[ch] )[i];
+         }
+@@ -556,7 +579,7 @@ bool DecoderContext::normalizeAudio( AVFrame * frame, vector & samples )
+       int16_t * out = ( int16_t * )&samples.front();
+       for ( int i = 0; i < frame->nb_samples; i++ )
+       {
+-        for ( int ch = 0; ch < codecContext_->channels; ch++ )
++        for ( int ch = 0; ch < nbChannels(); ch++ )
+         {
+           *out++ = ( ( int16_t * )frame->extended_data[ch] )[i];
+         }
diff --git a/office/goldendict/goldendict.SlackBuild b/office/goldendict/goldendict.SlackBuild
index 088823db1b1..2e4d5428c8f 100644
--- a/office/goldendict/goldendict.SlackBuild
+++ b/office/goldendict/goldendict.SlackBuild
@@ -69,6 +69,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/ffmpeg7.patch
+
 # Fixing QMake in goldendict.pro file (source: aur.archlinux.org)
 echo "QMAKE_CFLAGS_RELEASE = ${SLKCFLAGS}"   >> goldendict.pro
 echo "QMAKE_CXXFLAGS_RELEASE = ${SLKCFLAGS}" >> goldendict.pro
diff --git a/office/neoleo/neoleo.SlackBuild b/office/neoleo/neoleo.SlackBuild
index c8d46d20f8a..e9fc6e8a77d 100644
--- a/office/neoleo/neoleo.SlackBuild
+++ b/office/neoleo/neoleo.SlackBuild
@@ -80,6 +80,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 {} \;
 
+sed -i '6i #include ' src/neotypes.h
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/office/qpdfview/qpdfview.SlackBuild b/office/qpdfview/qpdfview.SlackBuild
index 4e16cd0dc8d..ddf9c860da5 100644
--- a/office/qpdfview/qpdfview.SlackBuild
+++ b/office/qpdfview/qpdfview.SlackBuild
@@ -63,6 +63,8 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
+sed -i 's|c++11|c++17|' qpdfview.pri
+
 # Add localizations
 lrelease-qt5 qpdfview.pro
 
diff --git a/office/scribus/harfbuzz-3.0.0.patch b/office/scribus/harfbuzz-3.0.0.patch
deleted file mode 100644
index 4dc4f0db4a3..00000000000
--- a/office/scribus/harfbuzz-3.0.0.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 1b546978bc4ea0b2a73fbe4d7cf947887e865162 Mon Sep 17 00:00:00 2001
-From: Jean Ghali 
-Date: Sat, 21 Aug 2021 20:05:43 +0000
-Subject: [PATCH] Use new hb-subset api with harfbuzz >= 2.9.0 in order to
- prepeare for removal of legacy API in 3.0
-
-git-svn-id: svn://scribus.net/trunk/Scribus@24696 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/fonts/sfnt.cpp | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp
-index 50777f66e3..fca8b39158 100644
---- a/scribus/fonts/sfnt.cpp
-+++ b/scribus/fonts/sfnt.cpp
-@@ -1256,11 +1256,19 @@ namespace sfnt {
- 
- 		for (int i = 0; i < cids.count(); ++i)
- 			hb_set_add(glyphSet, cids.at(i));
--	
-+
-+#if HB_VERSION_ATLEAST(2, 9, 0)
-+		uint32_t subsetFlags = (uint32_t) hb_subset_input_get_flags(hbSubsetInput.get());
-+		subsetFlags |= HB_SUBSET_FLAGS_RETAIN_GIDS;
-+		subsetFlags &= ~HB_SUBSET_FLAGS_NO_HINTING;
-+		subsetFlags |= HB_SUBSET_FLAGS_NAME_LEGACY;
-+		hb_subset_input_set_flags(hbSubsetInput.get(), subsetFlags);
-+#else
- 		hb_subset_input_set_retain_gids(hbSubsetInput.get(), true);
- 		hb_subset_input_set_drop_hints(hbSubsetInput.get(), false);
- #if HB_VERSION_ATLEAST(2, 6, 5)
- 		hb_subset_input_set_name_legacy(hbSubsetInput.get(), true);
-+#endif
- #endif
- 
- 		QScopedPointer hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
-
-From 68ec41169eaceea4a6e1d6f359762a191c7e61d5 Mon Sep 17 00:00:00 2001
-From: Jean Ghali 
-Date: Sun, 19 Sep 2021 11:59:50 +0000
-Subject: [PATCH] #16635: Replace hb_subset, removed in harfbuzz 3.0, by
- hb_subset_or_fail
-
-git-svn-id: svn://scribus.net/trunk/Scribus@24707 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/fonts/sfnt.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp
-index fca8b39158..b3dfa50dc6 100644
---- a/scribus/fonts/sfnt.cpp
-+++ b/scribus/fonts/sfnt.cpp
-@@ -1271,9 +1271,15 @@ namespace sfnt {
- #endif
- #endif
- 
-+#if HB_VERSION_ATLEAST(2, 9, 0)
-+		QScopedPointer hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get()));
-+		if (hbSubsetFace.isNull())
-+			return QByteArray();
-+#else
- 		QScopedPointer hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get()));
- 		if (hbSubsetFace.isNull())
- 			return QByteArray();
-+#endif
- 
- 		QScopedPointer hbSubsetBlob(hb_face_reference_blob(hbSubsetFace.get()));
- 		if (hbSubsetBlob.isNull())
diff --git a/office/scribus/poppler2410.patch b/office/scribus/poppler2410.patch
new file mode 100644
index 00000000000..654c1981ac2
--- /dev/null
+++ b/office/scribus/poppler2410.patch
@@ -0,0 +1,149 @@
+Index: scribus/plugins/import/pdf/slaoutput.cpp
+===================================================================
+--- scribus/plugins/import/pdf/slaoutput.cpp	(revision 26323)
++++ scribus/plugins/import/pdf/slaoutput.cpp	(revision 26324)
+@@ -81,6 +81,8 @@
+ 	}
+ }
+ 
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(24, 10, 0)
++
+ LinkSubmitForm::LinkSubmitForm(Object *actionObj)
+ {
+ 	if (!actionObj->isDict())
+@@ -111,6 +113,8 @@
+ 	delete fileName;
+ }
+ 
++#endif
++
+ LinkImportData::LinkImportData(Object *actionObj)
+ {
+ 	if (!actionObj->isDict())
+@@ -1078,6 +1082,32 @@
+ 				}
+ 			}
+ 		}
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 89, 0)
++		else if (Lact->getKind() == actionResetForm)
++		{
++			ite->annotation().setActionType(4);
++		}
++#endif
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 10, 0)
++		else if (Lact->getKind() == actionSubmitForm)
++		{
++			const auto* impo = (LinkSubmitForm*) Lact;
++			if (impo->isOk())
++			{
++				ite->annotation().setActionType(3);
++				ite->annotation().setAction(UnicodeParsedString(impo->getUrl()));
++				int fl = impo->getFlags();
++				if (fl == 0)
++					ite->annotation().setHTML(0);
++				else if (fl == 4)
++					ite->annotation().setHTML(1);
++				else if (fl == 64)
++					ite->annotation().setHTML(2);
++				else if (fl == 512)
++					ite->annotation().setHTML(3);
++			}
++		}
++#endif
+ 		else if (Lact->getKind() == actionUnknown)
+ 		{
+ 			auto *uno = (LinkUnknown*) Lact;
+@@ -1106,7 +1136,11 @@
+ 						if (impo->isOk())
+ 						{
+ 							ite->annotation().setActionType(3);
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 10, 0)
++							ite->annotation().setAction(UnicodeParsedString(impo->getUrl()));
++#else
+ 							ite->annotation().setAction(UnicodeParsedString(impo->getFileName()));
++#endif
+ 							int fl = impo->getFlags();
+ 							if (fl == 0)
+ 								ite->annotation().setHTML(0);
+Index: scribus/plugins/import/pdf/slaoutput.h
+===================================================================
+--- scribus/plugins/import/pdf/slaoutput.h	(revision 26323)
++++ scribus/plugins/import/pdf/slaoutput.h	(revision 26324)
+@@ -56,9 +56,11 @@
+ #include 
+ 
+ //------------------------------------------------------------------------
+-// LinkSubmitData
++// LinkSubmitForm
+ //------------------------------------------------------------------------
+ 
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(24, 10, 0)
++
+ class LinkSubmitForm: public LinkAction
+ {
+ public:
+@@ -79,6 +81,8 @@
+ 	int m_flags {0};
+ };
+ 
++#endif
++
+ //------------------------------------------------------------------------
+ // LinkImportData
+ //------------------------------------------------------------------------
+Index: scribus/plugins/import/pdf/slaoutput.cpp
+===================================================================
+--- scribus/plugins/import/pdf/slaoutput.cpp	(revision 26325)
++++ scribus/plugins/import/pdf/slaoutput.cpp	(revision 26326)
+@@ -99,7 +99,7 @@
+ 			{
+ 				Object obj2 = obj1.dictLookup("F");
+ 				if (!obj2.isNull())
+-					fileName = obj2.getString()->copy();
++					m_url = obj2.getString()->copy();
+ 			}
+ 		}
+ 	}
+@@ -110,7 +110,7 @@
+ 
+ LinkSubmitForm::~LinkSubmitForm()
+ {
+-	delete fileName;
++	delete m_url;
+ }
+ 
+ #endif
+@@ -1136,11 +1136,7 @@
+ 						if (impo->isOk())
+ 						{
+ 							ite->annotation().setActionType(3);
+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 10, 0)
+ 							ite->annotation().setAction(UnicodeParsedString(impo->getUrl()));
+-#else
+-							ite->annotation().setAction(UnicodeParsedString(impo->getFileName()));
+-#endif
+ 							int fl = impo->getFlags();
+ 							if (fl == 0)
+ 								ite->annotation().setHTML(0);
+Index: scribus/plugins/import/pdf/slaoutput.h
+===================================================================
+--- scribus/plugins/import/pdf/slaoutput.h	(revision 26325)
++++ scribus/plugins/import/pdf/slaoutput.h	(revision 26326)
+@@ -70,14 +70,14 @@
+ 	virtual ~LinkSubmitForm();
+ 
+ 	// Was the LinkImportData created successfully?
+-	GBool isOk() POPPLER_CONST override { return fileName != nullptr; }
++	GBool isOk() POPPLER_CONST override { return m_url != nullptr; }
+ 	// Accessors.
+ 	LinkActionKind getKind() POPPLER_CONST override { return actionUnknown; }
+-	GooString *getFileName() { return fileName; }
++	GooString *getUrl() { return m_url; }
+ 	int getFlags() { return m_flags; }
+ 
+ private:
+-	GooString *fileName {nullptr};		// file name
++	GooString *m_url {nullptr};		// URL
+ 	int m_flags {0};
+ };
+ 
diff --git a/office/scribus/scribus.SlackBuild b/office/scribus/scribus.SlackBuild
index c7e17f62e8d..dba9a22c16d 100644
--- a/office/scribus/scribus.SlackBuild
+++ b/office/scribus/scribus.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for scribus
 
 # Copyright 2006 Martin Lefebvre 
-# Copyright 2008-2021 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2024 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -29,7 +29,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=scribus
-VERSION=${VERSION:-1.5.7}
+VERSION=${VERSION:-1.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -68,6 +68,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+if pkg-config --exists libpodofo ; then PODOFO="On" ; else PODOFO="Off" ; fi
+
 set -e
 
 rm -rf $PKG
@@ -83,13 +85,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 {} \;
 
-# thanks archlinux!
-patch -p1 < $CWD/harfbuzz-3.0.0.patch
+# upstream svn revisions 26324 and 26326
+patch -p0 < $CWD/poppler2410.patch
 
 cmake \
   -DCMAKE_C_FLAGS="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
   -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+  -DWITH_PODOFO=$PODOFO \
   -DLIB_SUFFIX=${LIBDIRSUFFIX}
 
 make
diff --git a/office/scribus/scribus.info b/office/scribus/scribus.info
index f1b56cd8dea..8e5d5166140 100644
--- a/office/scribus/scribus.info
+++ b/office/scribus/scribus.info
@@ -1,8 +1,8 @@
 PRGNAM="scribus"
-VERSION="1.5.7"
+VERSION="1.6.2"
 HOMEPAGE="https://www.scribus.net"
-DOWNLOAD="https://downloads.sourceforge.net/scribus/scribus-1.5.7.tar.xz"
-MD5SUM="4d0c63cfdade8a9abf225a4415e43694"
+DOWNLOAD="https://downloads.sourceforge.net/scribus/scribus-1.6.2.tar.xz"
+MD5SUM="925bf7f52bb86dc9fbd04c8491253fca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/xournal/xournal-0.4.8-c99-fix.patch b/office/xournal/xournal-0.4.8-c99-fix.patch
new file mode 100644
index 00000000000..ee3689cddd7
--- /dev/null
+++ b/office/xournal/xournal-0.4.8-c99-fix.patch
@@ -0,0 +1,89 @@
+Bug: https://bugs.gentoo.org/875158
+
+Patch: https://src.fedoraproject.org/rpms/xournal/raw/dacd5bf30ec95debca62946868d9450f68ea54de/f/xournal-c99-1.patch
+Patch: https://src.fedoraproject.org/rpms/xournal/raw/dacd5bf30ec95debca62946868d9450f68ea54de/f/xournal-c99-2.patch
+Author: Denis Auroux 
+Date:   Sun Jan 24 15:48:16 2021 -0500
+
+    Fix implicit function declarations by including config.h in ttsubset/*.c
+
+--- a/src/ttsubset/list.c
++++ b/src/ttsubset/list.c
+@@ -33,7 +33,7 @@
+  *
+  */
+ 
+-/* $Id$ */
++/* $Id: list.c,v 1.4 2004/09/10 18:59:06 jody Exp $ */
+ /* @(#)list.c 1.7 03/02/06 SMI */
+ 
+ /*
+@@ -44,6 +44,10 @@
+  *
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#  include 
++#endif
++
+ #include 
+ #include 
+ #ifdef MALLOC_TRACE
+--- a/src/ttsubset/sft.c
++++ b/src/ttsubset/sft.c
+@@ -33,7 +33,7 @@
+  *
+  */
+ 
+-/* $Id$ */
++/* $Id: sft.c,v 1.9 2005/01/04 20:10:46 jody Exp $ */
+ /* @(#)sft.c 1.17 03/01/08 SMI */
+ 
+ /*
+@@ -43,6 +43,10 @@
+  * @version 1.0
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#  include 
++#endif
++
+ #include 
+ #include 
+ #include 
+--- a/src/ttsubset/ttcr.c
++++ b/src/ttsubset/ttcr.c
+@@ -33,7 +33,7 @@
+  *
+  */
+ 
+-/* $Id$ */
++/* $Id: ttcr.c,v 1.7 2005/01/04 20:10:46 jody Exp $ */
+ /* @(#)ttcr.c 1.7 03/01/08 SMI */
+ 
+ /*
+@@ -44,6 +44,10 @@
+  *
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#  include 
++#endif
++
+ #include 
+ #ifdef HAVE_UNISTD_H
+ #include 
+
+Add missing include directives for make_dashed, set_cursor_busy.
+
+--- a/src/xo-image.c
++++ b/src/xo-image.c
+@@ -25,6 +25,8 @@
+ #include "xo-support.h"
+ #include "xo-image.h"
+ #include "xo-misc.h"
++#include "xo-selection.h"
++#include "xo-paint.h"
+ 
+ // create pixbuf from buffer, or return NULL on failure
+ GdkPixbuf *pixbuf_from_buffer(const gchar *buf, gsize buflen)
diff --git a/office/xournal/xournal.SlackBuild b/office/xournal/xournal.SlackBuild
index 23c177c0115..595aa842b55 100644
--- a/office/xournal/xournal.SlackBuild
+++ b/office/xournal/xournal.SlackBuild
@@ -61,6 +61,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch -p1 < $CWD/xournal-0.4.8-c99-fix.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/perl/mod_perl/mod_perl.SlackBuild b/perl/mod_perl/mod_perl.SlackBuild
index d197c0b49de..5a5fde9d5af 100644
--- a/perl/mod_perl/mod_perl.SlackBuild
+++ b/perl/mod_perl/mod_perl.SlackBuild
@@ -77,6 +77,9 @@ 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 {} \;
 
+# Thanks to msantinho @ LQ!
+patch -p0 < $CWD/r1910623.patch
+
 # Thanks to ARCH Linux
 sed -i -e '1098,1102d' Apache-Test/lib/Apache/TestRun.pm
 sed -i '51,56c push @INC, "xs/tables/current24";' lib/ModPerl/MapUtil.pm
diff --git a/perl/mod_perl/r1910623.patch b/perl/mod_perl/r1910623.patch
new file mode 100644
index 00000000000..a6939c54ec4
--- /dev/null
+++ b/perl/mod_perl/r1910623.patch
@@ -0,0 +1,23 @@
+Author: stevehay
+Date: Tue Jun 27 08:38:15 2023
+New Revision: 1910623
+
+Stop using do_open9() - this deprecated function was removed in 5.37.1
+
+Patch by Jitka Plesnikova  from https://rt.cpan.org/Ticket/Display.html?id=148451
+
+Index: src/modules/perl/modperl_io.c
+===================================================================
+--- src/modules/perl/modperl_io.c	(revision 1910622)
++++ src/modules/perl/modperl_io.c	(revision 1910623)
+@@ -116,8 +116,8 @@
+     save_gp(handle, 1);
+ 
+     sv_setref_pv(sv, "Apache2::RequestRec", (void*)r);
+-    status = do_open9(handle, mode == O_RDONLY ? "<:Apache2" : ">:Apache2",
+-                      9, FALSE, mode, 0, (PerlIO *)NULL, sv, 1);
++    status = do_openn(handle, mode == O_RDONLY ? "<:Apache2" : ">:Apache2",
++                      9, FALSE, mode, 0, (PerlIO *)NULL, &sv, 1);
+     if (status == 0) {
+         Perl_croak(aTHX_ "Failed to open STD%s: %" SVf,
+                    mode == O_RDONLY ? "IN" : "OUT", get_sv("!", TRUE));
diff --git a/perl/perl-IO-Tty/README b/perl/perl-IO-Tty/README
deleted file mode 100644
index 36d395c6c83..00000000000
--- a/perl/perl-IO-Tty/README
+++ /dev/null
@@ -1,10 +0,0 @@
-perl-IO-Tty (Pseudo TTY object class)
-
-IO::Tty - Perl extension that provides an interface to allow the 
-creation of a pseudo tty.
-
-IO::Tty is used internally by IO::Pty to create a pseudo-tty. Do not
-use it directly except to import constants, use IO::Pty.
-
-IO::Pty inherits from IO::Handle and so provides all the methods
-defined by the IO::Handle package.
diff --git a/perl/perl-IO-Tty/perl-IO-Tty.SlackBuild b/perl/perl-IO-Tty/perl-IO-Tty.SlackBuild
deleted file mode 100644
index 695202d8c0f..00000000000
--- a/perl/perl-IO-Tty/perl-IO-Tty.SlackBuild
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for perl-IO-Tty
-
-# Written by ruario
-
-# Original version of this script had no license. B. Watson's
-# modified version is licensed under the WTFPL. See
-# http://www.wtfpl.net/txt/copying/ for details.
-
-# 20240814 bkw: update for v1.20.
-# 20230224 bkw:
-# - new maintainer.
-# - update for v1.17.
-# - add license.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=perl-IO-Tty
-VERSION=${VERSION:-1.20}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-
-perl Makefile.PL \
-  PREFIX=/usr \
-  INSTALLDIRS=vendor \
-  INSTALLVENDORMAN3DIR=/usr/man/man3
-make
-strip blib/arch/auto/IO/Tty/Tty.so
-make test
-make install DESTDIR=$PKG
-gzip $PKG/usr/man/man*/*
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
-find $PKG -depth -type d -empty -delete || true
-
-PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
-mkdir -p $PKGDOC
-cp -a ChangeLog README* $PKGDOC
-cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$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
diff --git a/perl/perl-IO-Tty/perl-IO-Tty.info b/perl/perl-IO-Tty/perl-IO-Tty.info
deleted file mode 100644
index 529da315f3a..00000000000
--- a/perl/perl-IO-Tty/perl-IO-Tty.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="perl-IO-Tty"
-VERSION="1.20"
-HOMEPAGE="https://metacpan.org/pod/IO::Tty"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/T/TO/TODDR/IO-Tty-1.20.tar.gz"
-MD5SUM="b46e30de0e2b8fd4d17fb32002a2d03c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="B. Watson"
-EMAIL="urchlay@slackware.uk"
diff --git a/perl/perl-IO-Tty/slack-desc b/perl/perl-IO-Tty/slack-desc
deleted file mode 100644
index 191c5297898..00000000000
--- a/perl/perl-IO-Tty/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------------------------------------------------------|
-perl-IO-Tty: perl-IO-Tty (Pseudo TTY object class)
-perl-IO-Tty:
-perl-IO-Tty: Perl extension that provides an interface to allow the creation of a
-perl-IO-Tty: pseudo tty.
-perl-IO-Tty:
-perl-IO-Tty:
-perl-IO-Tty:
-perl-IO-Tty:
-perl-IO-Tty:
-perl-IO-Tty:
-perl-IO-Tty:
diff --git a/perl/perl-SDL/perl-SDL.SlackBuild b/perl/perl-SDL/perl-SDL.SlackBuild
index 25abb4f80d7..074dee801eb 100644
--- a/perl/perl-SDL/perl-SDL.SlackBuild
+++ b/perl/perl-SDL/perl-SDL.SlackBuild
@@ -80,6 +80,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 {} \;
 
+export CFLAGS="$SLKCFLAGS -fpermissive"
+
 perl Build.PL \
   prefix=/usr \
   installdirs=vendor \
diff --git a/perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.12-declaration.patch b/perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.12-declaration.patch
new file mode 100644
index 00000000000..5c0e9ec9852
--- /dev/null
+++ b/perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.12-declaration.patch
@@ -0,0 +1,11 @@
+--- map8.h
++++ map8.h
+@@ -81,7 +81,7 @@
+ 
+ U16*  map8_to_str16(Map8*, U8*, U16*, int, int*);
+ U8*   map8_to_str8 (Map8*, U16*, U8*, int, int*);
+-U8*   map8_recode_8(Map8*, Map8*, U8*, U8*, int, int*);
++U8*   map8_recode8 (Map8*, Map8*, U8*, U8*, int, int*);
+ 
+ int   map8_empty_block(Map8*, U8);
+ 
diff --git a/perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.12-type.patch b/perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.12-type.patch
new file mode 100644
index 00000000000..3ed151253e0
--- /dev/null
+++ b/perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.12-type.patch
@@ -0,0 +1,11 @@
+--- Map8.xs
++++ Map8.xs
+@@ -348,7 +348,7 @@
+ 	Map8* m2
+ 	PREINIT:
+ 	    STRLEN len;
+-	    STRLEN rlen;
++	    int rlen;
+ 	    char*  res;
+ 	INPUT:
+ 	    char* str = SvPV(ST(2), len);
diff --git a/perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.13-recode.patch b/perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.13-recode.patch
new file mode 100644
index 00000000000..3f4a99f93fb
--- /dev/null
+++ b/perl/perl-Unicode-Map8/patches/perl-Unicode-Map8-0.13-recode.patch
@@ -0,0 +1,22 @@
+--- Changes
++++ Changes
+@@ -48,7 +48,7 @@
+ 
+    Release 0.08
+ 
+-   A little patch to Makefile.PL from Andreas Knig that makes the
++   A little patch to Makefile.PL from Andreas König that makes the
+    umap program install by default.
+ 
+    Added some Unicode::Map8 compatibility stuff to the interface.
+--- README
++++ README
+@@ -231,7 +231,7 @@
+ 
+ COPYRIGHT
+ 
+-   1998-1999 Gisle Aas. All rights reserved.
++  © 1998-1999 Gisle Aas. All rights reserved.
+ 
+ This library is free software; you can redistribute it and/or modify
+ it under the same terms as Perl itself.
diff --git a/perl/perl-Unicode-Map8/perl-Unicode-Map8.SlackBuild b/perl/perl-Unicode-Map8/perl-Unicode-Map8.SlackBuild
index fba2954438b..a7edbb34a60 100644
--- a/perl/perl-Unicode-Map8/perl-Unicode-Map8.SlackBuild
+++ b/perl/perl-Unicode-Map8/perl-Unicode-Map8.SlackBuild
@@ -80,6 +80,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 {} \;
 
+for i in $CWD/patches/* ; do patch -p0 < $i ; done
+
 CFLAGS="$SLKCFLAGS" \
 perl Makefile.PL \
   PREFIX=/usr \
diff --git a/perl/perl-tk/patches/01_perl-Tk-widget.patch b/perl/perl-tk/patches/01_perl-Tk-widget.patch
new file mode 100644
index 00000000000..974e7614282
--- /dev/null
+++ b/perl/perl-tk/patches/01_perl-Tk-widget.patch
@@ -0,0 +1,26 @@
+--- ./demos/widget.orig	2008-01-02 13:24:14.000000000 +0100
++++ ./demos/widget	2008-01-02 13:27:10.000000000 +0100
+@@ -3,7 +3,8 @@
+ use 5.008;
+ use Config;
+ use Tk 804.000;
+-use lib Tk->findINC( 'demos/widget_lib' );
++#use lib Tk->findINC( 'demos/widget_lib' );
++use lib "@demopath@/widget_lib";
+ use Tk::widgets qw/ DialogBox ErrorDialog LabEntry ROText /;
+ use Tk::Config ();
+ use WidgetDemo;
+@@ -62,9 +63,11 @@
+     $l->destroy;
+ }
+ 
+-my $widget_lib = Tk->findINC('demos/widget_lib');
++#my $widget_lib = Tk->findINC('demos/widget_lib');
++my $widget_lib = "@demopath@/widget_lib";
+ my $wd = "$widget_lib/WidgetDemo.pm";
+-$WIDTRIB = Tk->findINC('demos/widtrib');
++#$WIDTRIB = Tk->findINC('demos/widtrib');
++$WIDTRIB = "@demopath@/widtrib";
+ unless (Tk::tainting) {
+     $WIDTRIB = $ENV{WIDTRIB} if defined $ENV{WIDTRIB};
+     $WIDTRIB = $ARGV[0] if defined $ARGV[0];
diff --git a/perl/perl-tk/patches/02_perl-Tk-debian.patch b/perl/perl-tk/patches/02_perl-Tk-debian.patch
new file mode 100644
index 00000000000..6b945b4b152
--- /dev/null
+++ b/perl/perl-tk/patches/02_perl-Tk-debian.patch
@@ -0,0 +1,71 @@
+--- perl-tk-804.027.orig/objGlue.c
++++ perl-tk-804.027/objGlue.c
+@@ -529,6 +529,10 @@
+       sv_utf8_upgrade(objPtr);
+ #endif
+      s = SvPV(objPtr, len);
++     if (!s)
++      {
++       return NULL;
++      }
+ #ifdef SvUTF8
+      if (!is_utf8_string(s,len))
+       {
+@@ -555,6 +559,10 @@
+    else
+     {
+      s = LangString(objPtr);
++     if (!s)
++      {
++       return NULL;
++      }
+ #ifdef SvUTF8
+      if (!is_utf8_string(s,strlen(s)))
+       {
+--- perl-tk-804.027.orig/pTk/mTk/generic/tkFont.c
++++ perl-tk-804.027/pTk/mTk/generic/tkFont.c
+@@ -1044,6 +1044,7 @@
+     TkFont *fontPtr, *firstFontPtr, *oldFontPtr;
+     int new, descent;
+     NamedFont *nfPtr;
++    char *fontString;
+ 
+     fiPtr = ((TkWindow *) tkwin)->mainPtr->fontInfoPtr;
+     if (objPtr->typePtr != &tkFontObjType) {
+@@ -1077,8 +1078,12 @@
+ 	cacheHashPtr = oldFontPtr->cacheHashPtr;
+ 	FreeFontObjProc(objPtr);
+     } else {
++	fontString = Tcl_GetString(objPtr);
++	if (fontString == NULL) {
++		fontString = "";
++	}
+ 	cacheHashPtr = Tcl_CreateHashEntry(&fiPtr->fontCache,
+-		Tcl_GetString(objPtr), &new);
++		fontString, &new);
+     }
+     firstFontPtr = (TkFont *) Tcl_GetHashValue(cacheHashPtr);
+     for (fontPtr = firstFontPtr; (fontPtr != NULL);
+@@ -1095,8 +1100,12 @@
+      * The desired font isn't in the table.  Make a new one.
+      */
+ 
++    fontString = Tcl_GetString(objPtr);
++    if (fontString == NULL) {
++	    fontString = "";
++    }
+     namedHashPtr = Tcl_FindHashEntry(&fiPtr->namedTable,
+-	    Tcl_GetString(objPtr));
++	    fontString);
+     if (namedHashPtr != NULL) {
+ 	/*
+ 	 * Construct a font based on a named font.
+@@ -1111,7 +1120,7 @@
+ 	 * Native font?
+ 	 */
+ 
+-	fontPtr = TkpGetNativeFont(tkwin, Tcl_GetString(objPtr));
++	fontPtr = TkpGetNativeFont(tkwin, fontString);
+ 	if (fontPtr == NULL) {
+ 	    TkFontAttributes fa;
+ 	    Tcl_Obj *dupObjPtr = Tcl_DuplicateObj(objPtr);
diff --git a/perl/perl-tk/patches/03_perl-Tk-seg.patch b/perl/perl-tk/patches/03_perl-Tk-seg.patch
new file mode 100644
index 00000000000..26201fa3a32
--- /dev/null
+++ b/perl/perl-tk/patches/03_perl-Tk-seg.patch
@@ -0,0 +1,33 @@
+diff -up Tk-804.028/pTk/mTk/generic/tkConfig.c.seg Tk-804.028/pTk/mTk/generic/tkConfig.c
+--- Tk-804.028/pTk/mTk/generic/tkConfig.c.seg	2008-03-11 23:29:39.000000000 -0400
++++ Tk-804.028/pTk/mTk/generic/tkConfig.c	2008-03-11 23:28:09.000000000 -0400
+@@ -1210,11 +1210,11 @@ GetOptionFromObj(interp, objPtr, tablePt
+      * First, check to see if the object already has the answer cached.
+      */
+ 
+-    if (objPtr->typePtr == &tkOptionObjType) {
++/*    if (objPtr->typePtr == &tkOptionObjType) {
+         if (objPtr->internalRep.twoPtrValue.ptr1 == (VOID *) tablePtr) {
+             return (Option *) objPtr->internalRep.twoPtrValue.ptr2;
+         }
+-    }
++    }*/
+ 
+     /*
+      * The answer isn't cached.
+@@ -2277,9 +2277,15 @@ Tk_GetOptionValue(interp, recordPtr, opt
+     if (optionPtr == NULL) {
+ 	return NULL;
+     }
++
++    if (optionPtr->specPtr == NULL) {
++	return NULL;
++    }
++
+     if (optionPtr->specPtr->type == TK_OPTION_SYNONYM) {
+ 	optionPtr = optionPtr->extra.synonymPtr;
+     }
++
+     if (optionPtr->specPtr->objOffset >= 0) {
+ 	resultPtr = *((Tcl_Obj **) (recordPtr + optionPtr->specPtr->objOffset));
+ 	if (resultPtr == NULL) {
diff --git a/perl/perl-tk/patches/04_perl-Tk-c99.patch b/perl/perl-tk/patches/04_perl-Tk-c99.patch
new file mode 100644
index 00000000000..2db1e17f1e9
--- /dev/null
+++ b/perl/perl-tk/patches/04_perl-Tk-c99.patch
@@ -0,0 +1,81 @@
+Avoid implicit ints and implicit function declarations.  These
+language features have been removed from C in 1999. Future compilers
+are likely to stop accepting these constructs by default.
+
+Submitted upstream: 
+
+diff -ur Tk-804.036.orig/config/signedchar.c Tk-804.036/config/signedchar.c
+--- Tk-804.036.orig/config/signedchar.c	2023-02-24 10:48:08.060779006 +0100
++++ Tk-804.036/config/signedchar.c	2023-02-24 10:48:58.315268904 +0100
+@@ -1,4 +1,4 @@
+-main()
++int main(void)
+ {
+  signed char x = 'a';
+  return (x - 'a');
+diff -ur Tk-804.036.orig/config/unsigned.c Tk-804.036/config/unsigned.c
+--- Tk-804.036.orig/config/unsigned.c	2023-02-24 10:48:08.054779067 +0100
++++ Tk-804.036/config/unsigned.c	2023-02-24 10:49:27.580971854 +0100
+@@ -1,15 +1,16 @@
++#include 
+ int main()
+ {
+  char x[] = "\377";
+  if (x[0] > 0)
+   {
+    printf("char is unsigned type\n");
+-   exit(0);
++   return 0;
+   }
+  else
+   {
+    printf("char is signed type\n");
+-   exit(1);
++   return 1;
+   }
+ }
+ 
+diff -ur Tk-804.036.orig/pTk/config/Hstrdup.c Tk-804.036/pTk/config/Hstrdup.c
+--- Tk-804.036.orig/pTk/config/Hstrdup.c	2023-02-24 10:48:08.010779514 +0100
++++ Tk-804.036/pTk/config/Hstrdup.c	2023-02-24 10:53:04.326771841 +0100
+@@ -6,7 +6,7 @@
+ {char *e;
+  char *p = strdup(STRING);
+  if (!p || strcmp(p,STRING))
+-  exit(1);
++  return 1;
+  return 0;
+ }
+ 
+diff -ur Tk-804.036.orig/pTk/config/Hstrtoul.c Tk-804.036/pTk/config/Hstrtoul.c
+--- Tk-804.036.orig/pTk/config/Hstrtoul.c	2023-02-24 10:48:08.013779483 +0100
++++ Tk-804.036/pTk/config/Hstrtoul.c	2023-02-24 10:50:13.205508745 +0100
+@@ -1,4 +1,5 @@
+ #include 
++#include 
+ 
+ int main()
+ {char *e;
+diff -ur Tk-804.036.orig/pTk/mTk/generic/tkEvent.c Tk-804.036/pTk/mTk/generic/tkEvent.c
+--- Tk-804.036.orig/pTk/mTk/generic/tkEvent.c	2023-02-24 10:48:07.324786476 +0100
++++ Tk-804.036/pTk/mTk/generic/tkEvent.c	2023-02-24 10:54:20.859995000 +0100
+@@ -1153,6 +1153,7 @@
+ Time
+ TkCurrentTime(dispPtr, fallbackCurrent)
+     TkDisplay *dispPtr;		/* Display for which the time is desired. */
++    int fallbackCurrent;
+ {
+     register XEvent *eventPtr;
+     ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
+diff -ur Tk-804.036.orig/pTk/mTk/generic/tkImage.c Tk-804.036/pTk/mTk/generic/tkImage.c
+--- Tk-804.036.orig/pTk/mTk/generic/tkImage.c	2023-02-24 10:48:07.321786507 +0100
++++ Tk-804.036/pTk/mTk/generic/tkImage.c	2023-02-24 10:55:56.174027554 +0100
+@@ -1083,6 +1083,8 @@
+ int y;
+ int width;
+ int height;
++int imgWidth;
++int imgHeight;
+ {
+     Tk_Tile tile = (Tk_Tile) clientData;
+     Tk_TileChange *handler;
diff --git a/perl/perl-tk/patches/05_perl-Tk-Fix-STRLEN-vs-int-pointer-confusion-in-Tcl_GetByteAr.patch b/perl/perl-tk/patches/05_perl-Tk-Fix-STRLEN-vs-int-pointer-confusion-in-Tcl_GetByteAr.patch
new file mode 100644
index 00000000000..1935073525b
--- /dev/null
+++ b/perl/perl-tk/patches/05_perl-Tk-Fix-STRLEN-vs-int-pointer-confusion-in-Tcl_GetByteAr.patch
@@ -0,0 +1,45 @@
+From a26233c844c52f49ef9cca5f88dd9063aac60d0f Mon Sep 17 00:00:00 2001
+From: Niko Tyni 
+Date: Thu, 11 Jan 2024 18:28:58 +0000
+Subject: [PATCH] Fix STRLEN vs int pointer confusion in
+ Tcl_GetByteArrayFromObj()
+
+Perl 5.37.2, more precisely commit
+
+ https://github.com/Perl/perl5/commit/1ef9039bccbfe64f47f201b6cfb7d6d23e0b08a7
+
+changed the implementation of SvPV() et al., breaking t/balloon.t,
+t/canvas2.t and t/photo.t on big-endian 64-bit architectures such as
+ppc64 and s390x because StringMatchGIF() no longer recognized GIF files.
+
+This is because Tcl_GetByteArrayFromObj() was calling SvPV() with an int
+pointer instead of a correct STRLEN pointer, and the new implementation
+is more sensitive to this: it assigns the pointers as-is, resulting in
+the int pointer pointing at the wrong end of the 64-bit length.
+
+Other functions taking a length pointer, at least Tcl_GetStringFromObj()
+already seem to do things correctly, so presumably this is not a
+systematic issue.
+---
+ objGlue.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/objGlue.c b/objGlue.c
+index d4927ea..dbd6a50 100644
+--- a/objGlue.c
++++ b/objGlue.c
+@@ -627,7 +627,10 @@ Tcl_GetByteArrayFromObj(Tcl_Obj * objPtr, int * lengthPtr)
+  sv_utf8_downgrade(objPtr, 0);
+  if (lengthPtr)
+   {
+-   return (unsigned char *) SvPV(objPtr, *lengthPtr);
++   STRLEN len;
++   unsigned char *s = SvPV(objPtr, len);
++   *lengthPtr = len;
++   return s;
+   }
+  else
+   {
+-- 
+2.30.2
+
diff --git a/perl/perl-tk/patches/06_perl-Tk-Fix-build-with-clang-16.patch b/perl/perl-tk/patches/06_perl-Tk-Fix-build-with-clang-16.patch
new file mode 100644
index 00000000000..79531f60956
--- /dev/null
+++ b/perl/perl-tk/patches/06_perl-Tk-Fix-build-with-clang-16.patch
@@ -0,0 +1,746 @@
+
+
+
+
+    
+    Tree - rpms/perl-Tk - src.fedoraproject.org
+        
+    
+    
+    
+    
+
+    
+    
+
+
+
+  
+  
+    
+    
+    
+    
+
+    

+
+
+

+  

+    

+      

+        

+        

+            

+

+        

+        

+            

+rpms / perl-Tk
+            

+        

+        

+      

+      

+        

+        

+        
+          
+          Clone
+        
+        

+          

+            

+              
Source Code

+
+              

+                

+                  
GIT

+                  
+                

+              

+            

+          

+        

+
+      

+    

+  

+

+
+
+  

+

+
+

+  
+  

+    

+    

+    

+  

+    

+    

+      Files
+    

+    

+
+    

+          

+            
+            

+                  
+                       el4
+                  
+                  
+                       el5
+                  
+                  
+                       el6
+                  
+                  
+                       f10
+                  
+                  
+                       f11
+                  
+                  
+                       f12
+                  
+                  
+                       f13
+                  
+                  
+                       f14
+                  
+                  
+                       f15
+                  
+                  
+                       f16
+                  
+                  
+                       f17
+                  
+                  
+                       f18
+                  
+                  
+                       f19
+                  
+                  
+                       f20
+                  
+                  
+                       f21
+                  
+                  
+                       f22
+                  
+                  
+                       f23
+                  
+                  
+                       f24
+                  
+                  
+                       f25
+                  
+                  
+                       f26
+                  
+                  
+                       f27
+                  
+                  
+                       f28
+                  
+                  
+                       f29
+                  
+                  
+                       f30
+                  
+                  
+                       f31
+                  
+                  
+                       f32
+                  
+                  
+                       f33
+                  
+                  
+                       f34
+                  
+                  
+                       f35
+                  
+                  
+                       f36
+                  
+                  
+                       f37
+                  
+                  
+                       f38
+                  
+                  
+                       f39
+                  
+                  
+                       f40
+                  
+                  
+                       f7
+                  
+                  
+                       f8
+                  
+                  
+                       f9
+                  
+                  
+                       fc6
+                  
+                  
+                       main
+                  
+                  
+                       rawhide
+                  
+            

+          

+    

+  

+    
+    

+      

+        
    
+          
  1. 
+            
+              
+                rawhide
+            
+          
    2. 
+          
  2. 
+            
+              perl-Tk-Fix-build-with-clang-16.patch
+          
    3. 
+        

+      

+
+  

+            

+                

+                    
+                    
+                

+
+                Blob
+
+                Blame
+
+                History
+
+                Raw
+            

+
+        
diff -up Tk-804.036/pTk/Xlib.t.orig Tk-804.036/pTk/Xlib.t
+--- Tk-804.036/pTk/Xlib.t.orig	2024-02-15 10:07:51.542657507 +0100
++++ Tk-804.036/pTk/Xlib.t	2024-02-15 10:08:51.500167194 +0100
+@@ -331,7 +331,7 @@ VFUNC(int,XIntersectRegion,V_XIntersectR
+ #endif /* !DO_X_EXCLUDE */
+ 
+ #ifndef XKeycodeToKeysym
+-VFUNC(KeySym,XKeycodeToKeysym,V_XKeycodeToKeysym,_ANSI_ARGS_((Display *, unsigned int, int)))
++VFUNC(KeySym,XKeycodeToKeysym,V_XKeycodeToKeysym,_ANSI_ARGS_((Display *, KeyCode, int)))
+ #endif /* #ifndef XKeycodeToKeysym */
+ 
+ #ifndef XKeysymToString
+

+  

+ 
 
+
+

+

+
+

+    

+
+        

+        

+            

+                

+                    
Powered by Pagure 5.14.1

+                    
+                

+                

+                    
© Red Hat, Inc. and others.

+                

+            

+        

+    

+
+
+    
+
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/perl/perl-tk/patches/07_perl-Tk-pregcomp2.c-Avoid-using-incompatible-pointer-type.patch b/perl/perl-tk/patches/07_perl-Tk-pregcomp2.c-Avoid-using-incompatible-pointer-type.patch
new file mode 100644
index 00000000000..9a493eaa797
--- /dev/null
+++ b/perl/perl-tk/patches/07_perl-Tk-pregcomp2.c-Avoid-using-incompatible-pointer-type.patch
@@ -0,0 +1,24 @@
+From 5c646b1cc55e18648918f101961afd1589a58168 Mon Sep 17 00:00:00 2001
+From: Christopher Chavez 
+Date: Mon, 19 Feb 2024 13:50:44 -0600
+Subject: [PATCH] pregcomp2.c: Avoid using incompatible pointer type
+
+See https://github.com/eserte/perl-tk/issues/98#issuecomment-1948125587
+---
+ config/pregcomp2.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/pregcomp2.c b/config/pregcomp2.c
+index 98506999..bb0b4539 100644
+--- a/config/pregcomp2.c
++++ b/config/pregcomp2.c
+@@ -4,5 +4,5 @@
+ 
+ int main() {
+     SV* sv = newSViv(0);
+-    regexp* rx = pregcomp(sv, 0);
++    void* rx = pregcomp(sv, 0);
+ }
+-- 
+2.43.0
+
diff --git a/perl/perl-tk/patches/08_perl-Tk-Avoid-using-incompatible-pointer-type-for-old_warn.patch b/perl/perl-tk/patches/08_perl-Tk-Avoid-using-incompatible-pointer-type-for-old_warn.patch
new file mode 100644
index 00000000000..791ae3c61a6
--- /dev/null
+++ b/perl/perl-tk/patches/08_perl-Tk-Avoid-using-incompatible-pointer-type-for-old_warn.patch
@@ -0,0 +1,30 @@
+diff -Naur Tk-804.036/Event/Event.xs Tk-804.036.new/Event/Event.xs
+--- Tk-804.036/Event/Event.xs	2021-02-07 17:34:03.000000000 +0100
++++ Tk-804.036.new/Event/Event.xs	2024-06-14 21:23:55.743817569 +0200
+@@ -1532,7 +1532,7 @@
+ BOOT:
+  {
+ #ifdef pWARN_NONE
+-  SV *old_warn = PL_curcop->cop_warnings;
++  void *old_warn = PL_curcop->cop_warnings;
+   PL_curcop->cop_warnings = pWARN_NONE;
+ #endif
+   newXS("Tk::Event::INIT", XS_Tk__Event_INIT, file);
+diff -Naur Tk-804.036/tkGlue.c Tk-804.036.new/tkGlue.c
+--- Tk-804.036/tkGlue.c	2021-02-07 17:34:04.000000000 +0100
++++ Tk-804.036.new/tkGlue.c	2024-06-14 21:25:08.742817569 +0200
+@@ -5543,13 +5543,8 @@
+  char *XEventMethods = "abcdfhkmopstvwxyABDEKNRSTWXY#";
+  char buf[128];
+  CV *cv;
+-#if PERL_REVISION > 5 || (PERL_REVISION == 5 && PERL_VERSION >= 9)
+-#define COP_WARNINGS_TYPE STRLEN*
+-#else
+-#define COP_WARNINGS_TYPE SV*
+-#endif
+ #ifdef pWARN_NONE
+- COP_WARNINGS_TYPE old_warn = PL_curcop->cop_warnings;
++ void *old_warn = PL_curcop->cop_warnings;
+  PL_curcop->cop_warnings = pWARN_NONE;
+ #endif
+ 
diff --git a/perl/perl-tk/patches/09_perl-Tk-Fix-incompatible-pointer-type-in-function-GetTextIndex.patch b/perl/perl-tk/patches/09_perl-Tk-Fix-incompatible-pointer-type-in-function-GetTextIndex.patch
new file mode 100644
index 00000000000..d90f76c544d
--- /dev/null
+++ b/perl/perl-tk/patches/09_perl-Tk-Fix-incompatible-pointer-type-in-function-GetTextIndex.patch
@@ -0,0 +1,746 @@
+
+
+
+
+    
+    Tree - rpms/perl-Tk - src.fedoraproject.org
+        
+    
+    
+    
+    
+
+    
+    
+
+
+
+  
+  
+    
+    
+    
+    
+
+    

+
+
+

+  

+    

+      

+        

+        

+            

+

+        

+        

+            

+rpms / perl-Tk
+            

+        

+        

+      

+      

+        

+        

+        
+          
+          Clone
+        
+        

+          

+            

+              
Source Code

+
+              

+                

+                  
GIT

+                  
+                

+              

+            

+          

+        

+
+      

+    

+  

+

+
+
+  

+

+
+

+  
+  

+    

+    

+    

+  

+    

+    

+      Files
+    

+    

+
+    

+          

+            
+            

+                  
+                       el4
+                  
+                  
+                       el5
+                  
+                  
+                       el6
+                  
+                  
+                       f10
+                  
+                  
+                       f11
+                  
+                  
+                       f12
+                  
+                  
+                       f13
+                  
+                  
+                       f14
+                  
+                  
+                       f15
+                  
+                  
+                       f16
+                  
+                  
+                       f17
+                  
+                  
+                       f18
+                  
+                  
+                       f19
+                  
+                  
+                       f20
+                  
+                  
+                       f21
+                  
+                  
+                       f22
+                  
+                  
+                       f23
+                  
+                  
+                       f24
+                  
+                  
+                       f25
+                  
+                  
+                       f26
+                  
+                  
+                       f27
+                  
+                  
+                       f28
+                  
+                  
+                       f29
+                  
+                  
+                       f30
+                  
+                  
+                       f31
+                  
+                  
+                       f32
+                  
+                  
+                       f33
+                  
+                  
+                       f34
+                  
+                  
+                       f35
+                  
+                  
+                       f36
+                  
+                  
+                       f37
+                  
+                  
+                       f38
+                  
+                  
+                       f39
+                  
+                  
+                       f40
+                  
+                  
+                       f7
+                  
+                  
+                       f8
+                  
+                  
+                       f9
+                  
+                  
+                       fc6
+                  
+                  
+                       main
+                  
+                  
+                       rawhide
+                  
+            

+          

+    

+  

+    
+    

+      

+        
    
+          
  1. 
+            
+              
+                rawhide
+            
+          
    2. 
+          
  2. 
+            
+              perl-Tk-Fix-incompatible-pointer-type-in-function-GetTextIndex.patch
+          
    3. 
+        

+      

+
+  

+            

+                

+                    
+                    
+                

+
+                Blob
+
+                Blame
+
+                History
+
+                Raw
+            

+
+        
diff -up Tk-804.036/pTk/mTk/generic/tkCanvText.c.orig Tk-804.036/pTk/mTk/generic/tkCanvText.c
+--- Tk-804.036/pTk/mTk/generic/tkCanvText.c.orig	2024-02-16 13:50:00.966946199 +0100
++++ Tk-804.036/pTk/mTk/generic/tkCanvText.c	2024-02-16 13:50:26.060152547 +0100
+@@ -1234,7 +1234,7 @@ GetTextIndex(interp, canvas, itemPtr, ob
+ 				 * index. */
+ {
+     TextItem *textPtr = (TextItem *) itemPtr;
+-    size_t length;
++    int length;
+     int c;
+     TkCanvas *canvasPtr = (TkCanvas *) canvas;
+     Tk_CanvasTextInfo *textInfoPtr = textPtr->textInfoPtr;
+

+  

+ 
 
+
+

+

+
+

+    

+
+        

+        

+            

+                

+                    
Powered by Pagure 5.14.1

+                    
+                

+                

+                    
© Red Hat, Inc. and others.

+                

+            

+        

+    

+
+
+    
+
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/perl/perl-tk/perl-tk.SlackBuild b/perl/perl-tk/perl-tk.SlackBuild
index 7cce2e57ba1..54f2d5b8c00 100644
--- a/perl/perl-tk/perl-tk.SlackBuild
+++ b/perl/perl-tk/perl-tk.SlackBuild
@@ -83,6 +83,7 @@ find -L . \
 
 # Apply a few patches
 patch -p0 < $CWD/perl_bin_path.diff
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
 
 # XFT=1 (font manager) support, which gives perl-tk programs the ability to
 # use all fonts accessible from XFT and antialiasing.
diff --git a/python/alabaster/README b/python/alabaster/README
deleted file mode 100644
index 596320ef6e3..00000000000
--- a/python/alabaster/README
+++ /dev/null
@@ -1,13 +0,0 @@
-A configurable sidebar-enabled Sphinx theme
-
-Alabaster is a visually (c)lean, responsive, configurable theme
-for the Sphinx documentation system. It is Python 2+3 compatible.
-
-It began as a third-party theme, and is still maintained separately,
-but as of Sphinx 1.3, Alabaster is an install-time dependency
-of Sphinx and is selected as the default theme.
-
-Live examples of this theme can be seen on this project's own
-website, paramiko.org, fabfile.org and pyinvoke.org.
-
-For more documentation, please see http://alabaster.readthedocs.io.
diff --git a/python/alabaster/alabaster.SlackBuild b/python/alabaster/alabaster.SlackBuild
deleted file mode 100644
index ffc51ad38ca..00000000000
--- a/python/alabaster/alabaster.SlackBuild
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for alabaster
-
-# Copyright 2017 Nikos Giotis 
-# 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.
-
-# Update 2023-11-25: Removed python2 support
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=alabaster
-VERSION=${VERSION:-0.7.13}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-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 {} \;
-
-python3 setup.py install --root=$PKG
-
-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
-cp -a LICENSE README.rst $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
diff --git a/python/alabaster/alabaster.info b/python/alabaster/alabaster.info
deleted file mode 100644
index 169e58e1b59..00000000000
--- a/python/alabaster/alabaster.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="alabaster"
-VERSION="0.7.13"
-HOMEPAGE="https://alabaster.readthedocs.io/"
-DOWNLOAD="https://files.pythonhosted.org/packages/94/71/a8ee96d1fd95ca04a0d2e2d9c4081dac4c2d2b12f7ddb899c8cb9bfd1532/alabaster-0.7.13.tar.gz"
-MD5SUM="2e05a5f4fe5a8b95e5e576cbf4a5d503"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Nikos Giotis"
-EMAIL="nikos.giotis@gmail.com"
diff --git a/python/alabaster/slack-desc b/python/alabaster/slack-desc
deleted file mode 100644
index ac64dcfad29..00000000000
--- a/python/alabaster/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------------------------------------------------------|
-alabaster: alabaster (A configurable sidebar-enabled Sphinx theme)
-alabaster:
-alabaster: Alabaster is a visually (c)lean, responsive, configurable theme for
-alabaster: the Sphinx documentation system. It is Python 2+3 compatible.
-alabaster:
-alabaster: https://alabaster.readthedocs.io/
-alabaster:
-alabaster:
-alabaster:
-alabaster:
-alabaster:
diff --git a/python/gi-docgen/README b/python/gi-docgen/README
deleted file mode 100644
index 0b1edcc084e..00000000000
--- a/python/gi-docgen/README
+++ /dev/null
@@ -1,5 +0,0 @@
-GI-DocGen is a document generator for GObject-based libraries. GObject
-is the base type system of the GNOME project. GI-Docgen reuses the
-introspection data generated by GObject-based libraries to generate the
-API reference of these libraries, as well as other ancillary
-documentation.
diff --git a/python/gi-docgen/gi-docgen.info b/python/gi-docgen/gi-docgen.info
deleted file mode 100644
index 7dba9e14f1f..00000000000
--- a/python/gi-docgen/gi-docgen.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="gi-docgen"
-VERSION="2023.1"
-HOMEPAGE="https://gnome.pages.gitlab.gnome.org/gi-docgen"
-DOWNLOAD="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/2023.1/gi-docgen-2023.1.tar.gz"
-MD5SUM="844e84610246501d3303ae9150d0cc24"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-toml python3-typogrify"
-MAINTAINER="Steven Voges"
-EMAIL="svoges.sbo@gmail.com"
diff --git a/python/gst-python/gst-python.SlackBuild b/python/gst-python/gst-python.SlackBuild
index 8add0166ae9..805527f8c27 100644
--- a/python/gst-python/gst-python.SlackBuild
+++ b/python/gst-python/gst-python.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gst-python
-VERSION=${VERSION:-1.18.5}
+VERSION=${VERSION:-1.24.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -101,7 +101,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog NEWS RELEASE README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING ChangeLog NEWS RELEASE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/gst-python/gst-python.info b/python/gst-python/gst-python.info
index 27d2f540950..f25ce655617 100644
--- a/python/gst-python/gst-python.info
+++ b/python/gst-python/gst-python.info
@@ -1,8 +1,8 @@
 PRGNAM="gst-python"
-VERSION="1.18.5"
+VERSION="1.24.1"
 HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-python.html"
-DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.18.5.tar.xz"
-MD5SUM="eb19229f72f61506e33182a6fbce4a2e"
+DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.24.1.tar.xz"
+MD5SUM="a04bf7cfc76de2096d2dfd9feb12ddba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/imagesize/imagesize.SlackBuild b/python/imagesize/imagesize.SlackBuild
index bf2370fa93d..9d860915b65 100644
--- a/python/imagesize/imagesize.SlackBuild
+++ b/python/imagesize/imagesize.SlackBuild
@@ -81,10 +81,6 @@ find -L . \
 
 python setup.py install --root=$PKG
 
-if python3 -c 'import sys' 2>/dev/null; then
-    python3 setup.py install --root=$PKG
-fi
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/python/pikepdf/pikepdf.SlackBuild b/python/pikepdf/pikepdf.SlackBuild
index ffd52a04d8b..ff201dfdb78 100644
--- a/python/pikepdf/pikepdf.SlackBuild
+++ b/python/pikepdf/pikepdf.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=pikepdf
-VERSION=${VERSION:-5.3.2}
+VERSION=${VERSION:-6.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
diff --git a/python/pikepdf/pikepdf.info b/python/pikepdf/pikepdf.info
index 841168a293b..d5376e1eea7 100644
--- a/python/pikepdf/pikepdf.info
+++ b/python/pikepdf/pikepdf.info
@@ -1,8 +1,8 @@
 PRGNAM="pikepdf"
-VERSION="5.3.2"
+VERSION="6.0.1"
 HOMEPAGE="https://github.com/pikepdf/pikepdf"
-DOWNLOAD="https://pypi.python.org/packages/source/p/pikepdf/pikepdf-5.3.2.tar.gz"
-MD5SUM="367ed61eeff72e190c58eb8bc1f882a7"
+DOWNLOAD="https://pypi.python.org/packages/source/p/pikepdf/pikepdf-6.0.1.tar.gz"
+MD5SUM="38b50358ea6c38212dc99bd6944e165c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-lxml pybind11 python3-deprecation python3-setuptools_scm_git_archive"
diff --git a/python/python-importlib_metadata/README b/python/python-importlib_metadata/README
deleted file mode 100644
index 628ad7454dd..00000000000
--- a/python/python-importlib_metadata/README
+++ /dev/null
@@ -1,4 +0,0 @@
-importlib_metadata is a library which provides an API for accessing
-an installed package's metadata, such as its entry points or its
-top-level name. This functionality intends to replace most uses of
-pkg_resources entry point API and metadata API.
diff --git a/python/python-importlib_metadata/python-importlib_metadata.SlackBuild b/python/python-importlib_metadata/python-importlib_metadata.SlackBuild
deleted file mode 100644
index 7722f201a85..00000000000
--- a/python/python-importlib_metadata/python-importlib_metadata.SlackBuild
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python-importlib_metadata
-
-# Copyright 2023-2024  fourtysixandtwo 
-# Copyright 2019-2020 Benjamin Trigona-Harany 
-# Copyright 2022  Dimitris Zlatanidis  Orestiada, Greece
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python-importlib_metadata
-VERSION=${VERSION:-8.5.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-SRCNAM=importlib_metadata
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \+
-
-PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
-export PYTHONPATH=/opt/python$PYVER/site-packages/
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a \
-  README.rst \
-  $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
diff --git a/python/python-importlib_metadata/python-importlib_metadata.info b/python/python-importlib_metadata/python-importlib_metadata.info
deleted file mode 100644
index be5354362a6..00000000000
--- a/python/python-importlib_metadata/python-importlib_metadata.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python-importlib_metadata"
-VERSION="8.5.0"
-HOMEPAGE="https://importlib-metadata.readthedocs.io/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/i/importlib_metadata/importlib_metadata-8.5.0.tar.gz"
-MD5SUM="9bb42414dd82839d7694332868f2420a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python-zipp"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/python-importlib_metadata/slack-desc b/python/python-importlib_metadata/slack-desc
deleted file mode 100644
index a14e1318e81..00000000000
--- a/python/python-importlib_metadata/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------------------------------------------------------|
-python-importlib_metadata: python-importlib_metadata (Python package metadata)
-python-importlib_metadata:
-python-importlib_metadata: importlib_metadata is a library which provides an API for accessing
-python-importlib_metadata: an installed package's metadata, such as its entry points or its
-python-importlib_metadata: top-level name. This functionality intends to replace most uses of
-python-importlib_metadata: pkg_resources entry point API and metadata API.
-python-importlib_metadata:
-python-importlib_metadata:
-python-importlib_metadata:
-python-importlib_metadata:
-python-importlib_metadata:
diff --git a/python/python-pcapy/python-pcapy.SlackBuild b/python/python-pcapy/python-pcapy.SlackBuild
index fd1bd936703..eafdadf75eb 100644
--- a/python/python-pcapy/python-pcapy.SlackBuild
+++ b/python/python-pcapy/python-pcapy.SlackBuild
@@ -25,8 +25,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=python-pcapy
-SRCNAM=pcapy
-VERSION=${VERSION:-0.11.4}
+SRCNAM=pcapy-ng
+VERSION=${VERSION:-1.0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
diff --git a/python/python-pcapy/python-pcapy.info b/python/python-pcapy/python-pcapy.info
index abea62f2a2b..3956daa295e 100644
--- a/python/python-pcapy/python-pcapy.info
+++ b/python/python-pcapy/python-pcapy.info
@@ -1,8 +1,8 @@
 PRGNAM="python-pcapy"
-VERSION="0.11.4"
+VERSION="1.0.9"
 HOMEPAGE="https://www.coresecurity.com/corelabs-research/open-source-tools/pcapy"
-DOWNLOAD="https://github.com/CoreSecurity/pcapy/archive/0.11.4/pcapy-0.11.4.tar.gz"
-MD5SUM="ccc0ece6114a095800c8764f85451677"
+DOWNLOAD="https://github.com/stamparm/pcapy-ng/archive/1.0.9/pcapy-ng-1.0.9.tar.gz"
+MD5SUM="5f17398bbe18c0679e0ed2d07c470a44"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/python/python-smartypants/README b/python/python-smartypants/README
deleted file mode 100644
index f91f30930aa..00000000000
--- a/python/python-smartypants/README
+++ /dev/null
@@ -1,4 +0,0 @@
-smartypants.py is a Python fork of SmartyPants.
-
-Translate plain ASCII punctuation characters into "smart" typographic
-punctuation HTML entities.
diff --git a/python/python-smartypants/python-smartypants.info b/python/python-smartypants/python-smartypants.info
deleted file mode 100644
index 6d5ce4d88cf..00000000000
--- a/python/python-smartypants/python-smartypants.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python-smartypants"
-VERSION="2.0.1"
-HOMEPAGE="https://github.com/leohemsted/smartypants.py"
-DOWNLOAD="https://github.com/leohemsted/smartypants.py/archive/v2.0.1/smartypants.py-2.0.1.tar.gz"
-MD5SUM="27957540f4718e892039b2ed208c78f3"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Steven Voges"
-EMAIL="svoges.sbo@gmail.com"
diff --git a/python/python-smartypants/slack-desc b/python/python-smartypants/slack-desc
deleted file mode 100644
index ac1deaef3ad..00000000000
--- a/python/python-smartypants/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------------------------------------------------------|
-python-smartypants: python-smartypants (Smart Punctuation for Web Sites)
-python-smartypants:
-python-smartypants: Translate plain ASCII punctuation characters into "smart" typographic
-python-smartypants: punctuation HTML entities.
-python-smartypants:
-python-smartypants: Homepage: https://github.com/leohemsted/smartypants.py
-python-smartypants:
-python-smartypants:
-python-smartypants:
-python-smartypants:
-python-smartypants:
diff --git a/python/python-zipp/README b/python/python-zipp/README
deleted file mode 100644
index 6498203e6dc..00000000000
--- a/python/python-zipp/README
+++ /dev/null
@@ -1,2 +0,0 @@
-A pathlib-compatible Zipfile object wrapper. A backport of the Path
-object.
diff --git a/python/python-zipp/python-zipp.SlackBuild b/python/python-zipp/python-zipp.SlackBuild
deleted file mode 100644
index ecee0ef46a7..00000000000
--- a/python/python-zipp/python-zipp.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python-zipp
-
-# Copyright 2023-2024  fourtysixandtwo 
-# Copyright 2019-2020 Benjamin Trigona-Harany 
-# Copyright 2022  Dimitris Zlatanidis  Orestiada, Greece
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python-zipp
-VERSION=${VERSION:-3.21.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-SRCNAM=zipp
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \+
-
-PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
-export PYTHONPATH=/opt/python$PYVER/site-packages/
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a README.rst 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
diff --git a/python/python-zipp/python-zipp.info b/python/python-zipp/python-zipp.info
deleted file mode 100644
index 01881f7b89e..00000000000
--- a/python/python-zipp/python-zipp.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python-zipp"
-VERSION="3.21.0"
-HOMEPAGE="https://github.com/jaraco/zipp"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/z/zipp/zipp-3.21.0.tar.gz"
-MD5SUM="a758089a5cbb8fab61d73c8ff345eee2"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-setuptools-opt"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/python-zipp/slack-desc b/python/python-zipp/slack-desc
deleted file mode 100644
index 0445035132b..00000000000
--- a/python/python-zipp/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------------------------------------------------------|
-python-zipp: python-zipp (pathlib-compatible Zipfile object wrapper)
-python-zipp:
-python-zipp: A pathlib-compatible Zipfile object wrapper. A backport of the Path
-python-zipp: object.
-python-zipp:
-python-zipp:
-python-zipp:
-python-zipp:
-python-zipp:
-python-zipp:
-python-zipp:
diff --git a/python/python2-six/README b/python/python2-six/README
new file mode 100644
index 00000000000..aca5ddefaba
--- /dev/null
+++ b/python/python2-six/README
@@ -0,0 +1,5 @@
+Six is a Python 2 and 3 compatibility library. It provides utility
+functions for smoothing over the differences between the Python
+versions with the goal of writing Python code that is compatible on
+both Python versions. See the documentation for more information on
+what is provided.
diff --git a/python/python-smartypants/python-smartypants.SlackBuild b/python/python2-six/python2-six.SlackBuild
similarity index 74%
rename from python/python-smartypants/python-smartypants.SlackBuild
rename to python/python2-six/python2-six.SlackBuild
index b52fc9fa0ee..ed19e8034aa 100644
--- a/python/python-smartypants/python-smartypants.SlackBuild
+++ b/python/python2-six/python2-six.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/bash
 
-# Slackware build script for python-smartypants
+# Slackware build script for python2-six
 
-# Copyright 2022 Steven Voges 
+# Copyright 2012-2018 Larry Hajali 
+# Copyright 2024 Arkadiusz Drabczyk 
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,9 +25,9 @@
 
 cd $(dirname $0) ; CWD=$(pwd)
 
-PRGNAM=python-smartypants
-SRCNAM=smartypants.py
-VERSION=${VERSION:-2.0.1}
+PRGNAM=python2-six
+SRCNAM=six
+VERSION=${VERSION:-1.16.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -48,20 +49,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -70,6 +57,7 @@ cd $TMP
 rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -78,16 +66,25 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 python2 setup.py install --root=$PKG
-python3 setup.py install --root=$PKG
 
 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
 
+# Build and install documentation if sphinx is installed.
+if $(python -c 'import sphinx.pygments_styles' 2>/dev/null); then
+  make -j1 -C documentation man singlehtml
+  install -D -m 0644 documentation/_build/man/$SRCNAM.1 $PKG/usr/man/man1/$SRCNAM.1
+  gzip -9 $PKG/usr/man/man?/*.?
+fi
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  *.rst COPYING docs/*.rst \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION
+[ -d documentation/_build/singlehtml ] && \
+  cp -a documentation/_build/singlehtml/index.html \
+    documentation/_build/singlehtml/_static \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc -type f -exec chmod 0644 '{}' \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/python/python2-six/python2-six.info b/python/python2-six/python2-six.info
new file mode 100644
index 00000000000..89d425d9770
--- /dev/null
+++ b/python/python2-six/python2-six.info
@@ -0,0 +1,10 @@
+PRGNAM="python2-six"
+VERSION="1.16.0"
+HOMEPAGE="https://pypi.python.org/pypi/six/"
+DOWNLOAD="https://files.pythonhosted.org/packages/71/39/171f1c67cd00715f190ba0b100d606d440a28c93c7714febeca8b79af85e/six-1.16.0.tar.gz"
+MD5SUM="a7c927740e4964dd29b72cebfc1429bb"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="Arkadiusz Drabczyk"
+EMAIL="arkadiusz@drabczyk.org"
diff --git a/python/python2-six/slack-desc b/python/python2-six/slack-desc
new file mode 100644
index 00000000000..821615cd736
--- /dev/null
+++ b/python/python2-six/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------------------------------------------------------|
+python2-six: python2-six (Python 2 and 3 compatibility utilities)
+python2-six:
+python2-six: Six is a Python 2 and 3 compatibility library. It provides utility
+python2-six: functions for smoothing over the differences between the Python
+python2-six: versions with the goal of writing Python code that is compatible on
+python2-six: both Python versions. See the documentation for more information on
+python2-six: what is provided.
+python2-six:
+python2-six: Homepage: https://pypi.python.org/pypi/six/
+python2-six:
+python2-six:
diff --git a/python/python3-babel/README b/python/python3-babel/README
deleted file mode 100644
index 292ad0fb52a..00000000000
--- a/python/python3-babel/README
+++ /dev/null
@@ -1,10 +0,0 @@
-babel (python internationalization tools)
-
-Babel is a collection of tools for internationalizing Python apps.
-It's composed of two major parts:
-- tools to build and work with gettext message catalogs;
-- a Python interface to the CLDR (Common Locale Data Repository),
-  providing access to various locale display names, localized number
-  and date formatting, etc.
-
-The pytz dependency must be built with optional Python 3 support.
diff --git a/python/python3-babel/python3-babel.SlackBuild b/python/python3-babel/python3-babel.SlackBuild
deleted file mode 100644
index 29301f9b5de..00000000000
--- a/python/python3-babel/python3-babel.SlackBuild
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-babel
-#
-# Copyright 2021 Yth | Pont-en-Royans, France | yth@ythogtha.org
-# Copyright 2019-2021 Benjamin Trigona-Harany 
-# Copyright 2013-2018 Matteo Bernardini , Pisa, Italy
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-babel
-VERSION=${VERSION:-2.15.0}
-CLDRVER=${CLDRVER:-44.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-SRCNAM=babel
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \;
-
-sed -i "s/getiterator/iter/" scripts/import_cldr.py # support Python 3.9
-sed -i "s/elem.getchildren()/list(elem)/" scripts/import_cldr.py # support Python 3.9
-ln -s $CWD/cldr-common-$CLDRVER.zip cldr/
-python3 setup.py import_cldr
-python3 setup.py install --root=$PKG
-
-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
-cp -a \
-  AUTHORS* CHANGES* CONTRIBUTING* LICENSE* README* \
-  $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
diff --git a/python/python3-babel/python3-babel.info b/python/python3-babel/python3-babel.info
deleted file mode 100644
index 69f5af9611d..00000000000
--- a/python/python3-babel/python3-babel.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="python3-babel"
-VERSION="2.15.0"
-HOMEPAGE="http://babel.pocoo.org/"
-DOWNLOAD="https://github.com/python-babel/babel/archive/v2.15.0/babel-2.15.0.tar.gz \
-          http://unicode.org/Public/cldr/44/cldr-common-44.0.zip"
-MD5SUM="cd0818360a808a42860e95bf3e581530 \
-        75eca6e41976b235512192ecf657908f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-pytz"
-MAINTAINER="Yth - Arnaud"
-EMAIL="yth@ythogtha.org"
diff --git a/python/python3-babel/slack-desc b/python/python3-babel/slack-desc
deleted file mode 100644
index 3da49101789..00000000000
--- a/python/python3-babel/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------------------------------------------------------|
-python3-babel: python3-babel (python internationalization tools)
-python3-babel:
-python3-babel: Babel is a collection of tools for internationalizing Python apps.
-python3-babel: It's composed of two major parts:
-python3-babel: - tools to build and work with gettext message catalogs;
-python3-babel: - a Python interface to the CLDR (Common Locale Data Repository),
-python3-babel: providing access to various locale display names, localized number
-python3-babel: and date formatting, etc.
-python3-babel:
-python3-babel: homepage: http://babel.edgewall.org/
-python3-babel:
diff --git a/python/python3-build/README b/python/python3-build/README
deleted file mode 100644
index 204337b2889..00000000000
--- a/python/python3-build/README
+++ /dev/null
@@ -1,9 +0,0 @@
-A simple, correct PEP517 package builder.
-
-NOTE:
-  Has a soft requirement for python-importlib_metadata (and python-zipp)
-  which should be installed as it fixes a stdlib bug, but newer versions
-  have a circular dep on this slackbuild so cannot be built before it.
-  Therefore it will NOT be added to REQUIRES here.
-
-  This change will not affect most python builds.
diff --git a/python/python3-build/python3-build.SlackBuild b/python/python3-build/python3-build.SlackBuild
deleted file mode 100644
index 2070a1a9bec..00000000000
--- a/python/python3-build/python3-build.SlackBuild
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-build
-
-# Copyright 2023-2024  fourtysixandtwo 
-# Copyright 2022 toolonely 
-# 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.
-
-# 20230507 46and2: New maintainer, updated version and deps.
-#   -build process changed
-# 20231212 46and2: Remove python-importlib_metadata as dep, see README.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-build
-SRCNAM=${PRGNAM#python3-*}
-VERSION=${VERSION:-1.2.2.post1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \+
-
-python3 -m flit_core.wheel
-python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a \
-  PKG-INFO \
-  README.md \
-  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
diff --git a/python/python3-build/python3-build.info b/python/python3-build/python3-build.info
deleted file mode 100644
index 465bf58a692..00000000000
--- a/python/python3-build/python3-build.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-build"
-VERSION="1.2.2.post1"
-HOMEPAGE="https://github.com/pypa/build"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/b/build/build-1.2.2.post1.tar.gz"
-MD5SUM="5492ba887b363f483d64a11bbec0c34a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-pyproject-hooks"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/python3-build/slack-desc b/python/python3-build/slack-desc
deleted file mode 100644
index e81b98eb3be..00000000000
--- a/python/python3-build/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------------------------------------------------------|
-python3-build: python3-build (a simple, correct PEP517 package builder)
-python3-build:
-python3-build: Homepage: https://github.com/pypa/build
-python3-build:
-python3-build:
-python3-build:
-python3-build:
-python3-build:
-python3-build:
-python3-build:
-python3-build:
diff --git a/python/python3-editables/README b/python/python3-editables/README
deleted file mode 100644
index a3cd52fce85..00000000000
--- a/python/python3-editables/README
+++ /dev/null
@@ -1,6 +0,0 @@
-python3-editables (A Python library for creating editable wheels)
-
-This library supports the building of wheels which, when installed,
-will expose packages in a local directory on sys.path in "editable
-mode". In other words, changes to the package source will be reflected
-in the package visible to Python, without needing a reinstall.
diff --git a/python/python3-editables/python3-editables.SlackBuild b/python/python3-editables/python3-editables.SlackBuild
deleted file mode 100644
index 2c8681fccbf..00000000000
--- a/python/python3-editables/python3-editables.SlackBuild
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-editables
-
-# Copyright 2022-23  fourtysixandtwo 
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-editables
-SRCNAM=${PRGNAM#python3-*}
-VERSION=${VERSION:-0.5}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "aarch64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z
-cd $SRCNAM-$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 {} \+
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a LICENSE.txt README.md $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
diff --git a/python/python3-editables/python3-editables.info b/python/python3-editables/python3-editables.info
deleted file mode 100644
index c954b6059a8..00000000000
--- a/python/python3-editables/python3-editables.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-editables"
-VERSION="0.5"
-HOMEPAGE="https://github.com/pfmoore/editables"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/e/editables/editables-0.5.tar.gz"
-MD5SUM="520de8c3a9dc5dfb2b365d104541c9de"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-build python3-wheel"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/python3-editables/slack-desc b/python/python3-editables/slack-desc
deleted file mode 100644
index a0b5bf59038..00000000000
--- a/python/python3-editables/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------------------------------------------------------|
-python3-editables: python3-editables (A Python library for creating editable wheels)
-python3-editables:
-python3-editables: This library supports the building of wheels which, when installed,
-python3-editables: will expose packages in a local directory on sys.path in "editable
-python3-editables: mode". In other words, changes to the package source will be reflected
-python3-editables: in the package visible to Python, without needing a reinstall.
-python3-editables:
-python3-editables:
-python3-editables: Homepage: https://github.com/pfmoore/editables
-python3-editables:
-python3-editables:
diff --git a/python/python3-exceptiongroup/README b/python/python3-exceptiongroup/README
deleted file mode 100644
index 067316d0b25..00000000000
--- a/python/python3-exceptiongroup/README
+++ /dev/null
@@ -1,4 +0,0 @@
-python3-exceptiongroup (Backport of PEP 654 exception groups)
-
-This is a backport of the BaseExceptionGroup and ExceptionGroup
-classes from Python 3.11.
diff --git a/python/python3-exceptiongroup/python3-exceptiongroup.SlackBuild b/python/python3-exceptiongroup/python3-exceptiongroup.SlackBuild
deleted file mode 100644
index ab6436c3b87..00000000000
--- a/python/python3-exceptiongroup/python3-exceptiongroup.SlackBuild
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-exceptiongroup
-
-# Copyright 2023-2024  fourtysixandtwo 
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-exceptiongroup
-SRCNAM=${PRGNAM#python3-*}
-VERSION=${VERSION:-1.2.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z
-cd $SRCNAM-$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 {} \+
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a LICENSE README.rst $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
diff --git a/python/python3-exceptiongroup/python3-exceptiongroup.info b/python/python3-exceptiongroup/python3-exceptiongroup.info
deleted file mode 100644
index 68805da217f..00000000000
--- a/python/python3-exceptiongroup/python3-exceptiongroup.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-exceptiongroup"
-VERSION="1.2.2"
-HOMEPAGE="https://github.com/agronholm/exceptiongroup"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/e/exceptiongroup/exceptiongroup-1.2.2.tar.gz"
-MD5SUM="e371f497eba3ca3fa6ac6f0dc2a08919"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-flit_scm"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/python3-exceptiongroup/slack-desc b/python/python3-exceptiongroup/slack-desc
deleted file mode 100644
index edf3fce5525..00000000000
--- a/python/python3-exceptiongroup/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------------------------------------------------------|
-python3-exceptiongroup: python3-exceptiongroup (Backport of PEP 654 exception groups)
-python3-exceptiongroup:
-python3-exceptiongroup: This is a backport of the BaseExceptionGroup and ExceptionGroup
-python3-exceptiongroup: classes from Python 3.11.
-python3-exceptiongroup:
-python3-exceptiongroup: Homepage: https://github.com/agronholm/exceptiongroup
-python3-exceptiongroup:
-python3-exceptiongroup:
-python3-exceptiongroup:
-python3-exceptiongroup:
-python3-exceptiongroup:
diff --git a/python/python3-flit_core/README b/python/python3-flit_core/README
deleted file mode 100644
index 67f3ec7efdf..00000000000
--- a/python/python3-flit_core/README
+++ /dev/null
@@ -1,9 +0,0 @@
-python3-flit_core (Simplified pkging of Python modules, core backend)
-
-Flit is a simple way to put Python packages and modules on PyPI. It
-tries to require less thought about packaging and help you avoid
-common mistakes.
-
-This provides a PEP 517 build backend for packages using Flit.
-The only public interface is the API specified by PEP 517, at
-``flit_core.buildapi``.
diff --git a/python/python3-flit_core/python3-flit_core.SlackBuild b/python/python3-flit_core/python3-flit_core.SlackBuild
deleted file mode 100644
index 50411234e2d..00000000000
--- a/python/python3-flit_core/python3-flit_core.SlackBuild
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-flit_core
-
-# Copyright 2022-2024  fourtysixandtwo 
-# 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.
-
-# 20230412 46and2: Remove DEPS, use bootstrap install.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-flit_core
-SRCNAM=${PRGNAM#python3-*}
-VERSION=${VERSION:-3.10.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z
-cd $SRCNAM-$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 {} \+
-
-python3 -m flit_core.wheel
-python3 bootstrap_install.py --install-root "$PKG" dist/*.whl
-
-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
-cp -a 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
diff --git a/python/python3-flit_core/python3-flit_core.info b/python/python3-flit_core/python3-flit_core.info
deleted file mode 100644
index a111e7f1b50..00000000000
--- a/python/python3-flit_core/python3-flit_core.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-flit_core"
-VERSION="3.10.1"
-HOMEPAGE="https://github.com/pypa/flit"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/f/flit_core/flit_core-3.10.1.tar.gz"
-MD5SUM="a3381dd58e23e9826c5199b1f70318b0"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/python3-flit_core/slack-desc b/python/python3-flit_core/slack-desc
deleted file mode 100644
index 1ec6924944a..00000000000
--- a/python/python3-flit_core/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------------------------------------------------------|
-python3-flit_core: python3-flit_core (Simplified pkging of Python modules, core backend)
-python3-flit_core:
-python3-flit_core: Flit is a simple way to put Python packages and modules on PyPI. It
-python3-flit_core: tries to require less thought about packaging and help you avoid
-python3-flit_core: common mistakes.
-python3-flit_core:
-python3-flit_core:
-python3-flit_core:
-python3-flit_core: Homepage: https://github.com/pypa/flit
-python3-flit_core:
-python3-flit_core:
diff --git a/python/python3-glad/README b/python/python3-glad/README
deleted file mode 100644
index 0dd3f362009..00000000000
--- a/python/python3-glad/README
+++ /dev/null
@@ -1,5 +0,0 @@
-python3-glad (Python binding for GLAD Loader-Generator)
-
-GLAD is a Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator
-based on the official specifications for multiple languages.
-
diff --git a/python/python3-glad/python3-glad.SlackBuild b/python/python3-glad/python3-glad.SlackBuild
deleted file mode 100644
index 396bd986564..00000000000
--- a/python/python3-glad/python3-glad.SlackBuild
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-glad
-
-# Copyright 2023,2024 Christoph Willing  Sydney, Australia
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-glad
-SRCNAM=glad
-VERSION=${VERSION:-2.0.8}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \;
-
-PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
-export PYTHONPATH=/opt/python$PYVER/site-packages
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a LICENSE README.md $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
diff --git a/python/python3-glad/python3-glad.info b/python/python3-glad/python3-glad.info
deleted file mode 100644
index 9dbcf95f93e..00000000000
--- a/python/python3-glad/python3-glad.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-glad"
-VERSION="2.0.8"
-HOMEPAGE="https://github.com/Dav1dde/glad"
-DOWNLOAD="https://github.com/Dav1dde/glad/archive/v2.0.8/glad-2.0.8.tar.gz"
-MD5SUM="028c39d581e6b53e53871f1dc21cf442"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-setuptools-opt"
-MAINTAINER="Christoph Willling"
-EMAIL="chris.willing@linux.com"
diff --git a/python/python3-glad/slack-desc b/python/python3-glad/slack-desc
deleted file mode 100644
index 459c4a51578..00000000000
--- a/python/python3-glad/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------------------------------------------------------|
-python3-glad: python3-glad (Python binding for GLAD Loader-Generator)
-python3-glad:
-python3-glad: GLAD is a Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator
-python3-glad: based on the official specifications for multiple languages.
-python3-glad:
-python3-glad:
-python3-glad:
-python3-glad:
-python3-glad:
-python3-glad:
-python3-glad:
diff --git a/python/python3-hatch_vcs/README b/python/python3-hatch_vcs/README
deleted file mode 100644
index 5352bdcb6d2..00000000000
--- a/python/python3-hatch_vcs/README
+++ /dev/null
@@ -1,4 +0,0 @@
-python3-hatch_vcs (Hatch plugin for versioning with preferred VCS)
-
-This provides a plugin for Hatch that uses your preferred version
-control system (like Git) to determine project versions.
diff --git a/python/python3-hatch_vcs/python3-hatch_vcs.SlackBuild b/python/python3-hatch_vcs/python3-hatch_vcs.SlackBuild
deleted file mode 100644
index d92bd8f8374..00000000000
--- a/python/python3-hatch_vcs/python3-hatch_vcs.SlackBuild
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-hatch_vcs
-
-# Copyright 2022-2024  fourtysixandtwo 
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-hatch_vcs
-SRCNAM=${PRGNAM#python3-*}
-VERSION=${VERSION:-0.4.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z
-cd $SRCNAM-$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 {} \+
-
-PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
-export PYTHONPATH=/opt/python$PYVER/site-packages
-
-#lower version requirement of setuptools-scm to get rid of warning
-sed -i 's/6\.4\.0/6.3.2/' pyproject.toml
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a LICENSE.txt README.md $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
diff --git a/python/python3-hatch_vcs/python3-hatch_vcs.info b/python/python3-hatch_vcs/python3-hatch_vcs.info
deleted file mode 100644
index dffbccf6825..00000000000
--- a/python/python3-hatch_vcs/python3-hatch_vcs.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-hatch_vcs"
-VERSION="0.4.0"
-HOMEPAGE="https://github.com/ofek/hatch-vcs"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/h/hatch_vcs/hatch_vcs-0.4.0.tar.gz"
-MD5SUM="d801fe7c3e5955307748f2790bbb3488"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-hatchling"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/python3-hatch_vcs/slack-desc b/python/python3-hatch_vcs/slack-desc
deleted file mode 100644
index 7fa4dcce7db..00000000000
--- a/python/python3-hatch_vcs/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------------------------------------------------------|
-python3-hatch_vcs: python3-hatch_vcs (Hatch plugin for versioning with preferred VCS)
-python3-hatch_vcs:
-python3-hatch_vcs: This provides a plugin for Hatch that uses your preferred version
-python3-hatch_vcs: control system (like Git) to determine project versions.
-python3-hatch_vcs:
-python3-hatch_vcs:
-python3-hatch_vcs:
-python3-hatch_vcs:
-python3-hatch_vcs: Homepage: https://github.com/ofek/hatch-vcs
-python3-hatch_vcs:
-python3-hatch_vcs:
diff --git a/python/python3-hatchling/README b/python/python3-hatchling/README
deleted file mode 100644
index 23639b967c9..00000000000
--- a/python/python3-hatchling/README
+++ /dev/null
@@ -1,10 +0,0 @@
-python3-hatchling (Hatch build backend)
-
-This is the extensible, standards compliant build backend used by
-Hatch.
-
-Add the following before the python3 build commands in your
-Slackbuild as hatchling now requires python3-packaging-opt:
-
-PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
-export PYTHONPATH=/opt/python$PYVER/site-packages
diff --git a/python/python3-hatchling/python3-hatchling.SlackBuild b/python/python3-hatchling/python3-hatchling.SlackBuild
deleted file mode 100644
index a1f84fb742a..00000000000
--- a/python/python3-hatchling/python3-hatchling.SlackBuild
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-hatchling
-
-# Copyright 2022-2024  fourtysixandtwo 
-# 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.
-
-# 20240908 46and2: Updated version of packaging in /opt is now required.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-hatchling
-SRCNAM=${PRGNAM#python3-*}
-VERSION=${VERSION:-1.26.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z
-cd $SRCNAM-$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 {} \+
-
-PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
-export PYTHONPATH=/opt/python$PYVER/site-packages
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a LICENSE.txt README.md $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
diff --git a/python/python3-hatchling/python3-hatchling.info b/python/python3-hatchling/python3-hatchling.info
deleted file mode 100644
index 285306edf68..00000000000
--- a/python/python3-hatchling/python3-hatchling.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-hatchling"
-VERSION="1.26.3"
-HOMEPAGE="https://github.com/pypa/hatch/tree/master/backend"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/h/hatchling/hatchling-1.26.3.tar.gz"
-MD5SUM="409caa84d49b96410924c0119c7d0530"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-editables python3-pathspec python3-pluggy python3-trove-classifiers python3-setuptools-opt"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/python3-hatchling/slack-desc b/python/python3-hatchling/slack-desc
deleted file mode 100644
index 269e1d0265a..00000000000
--- a/python/python3-hatchling/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------------------------------------------------------|
-python3-hatchling: python3-hatchling (Hatch build backend)
-python3-hatchling:
-python3-hatchling: This is the extensible, standards compliant build backend used by
-python3-hatchling: Hatch.
-python3-hatchling:
-python3-hatchling:
-python3-hatchling:
-python3-hatchling:
-python3-hatchling: Homepage: https://github.com/pypa/hatch/tree/master/backend
-python3-hatchling:
-python3-hatchling:
diff --git a/python/python3-installer/README b/python/python3-installer/README
deleted file mode 100644
index 46ae1e6e70a..00000000000
--- a/python/python3-installer/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a low-level library for installing a Python package from a
-wheel distribution. It provides basic functionality and abstractions
-for handling wheels and installing packages from wheels.
diff --git a/python/python3-installer/python3-installer.SlackBuild b/python/python3-installer/python3-installer.SlackBuild
deleted file mode 100644
index 6d8c04f8acd..00000000000
--- a/python/python3-installer/python3-installer.SlackBuild
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-installer
-
-# Copyright 2023  fourtysixandtwo 
-# Copyright 2022  Heinz Wiesinger, Amsterdam, The Netherlands
-# 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.
-
-# 20230517 46and2: Updated version, new maintainer.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-installer
-SRCNAM=${PRGNAM#python3-*}
-VERSION=${VERSION:-0.7.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "aarch64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \+
-
-python3 -m flit_core.wheel
-PYTHONPATH=src python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a CONTRIBUTING.md LICENSE PKG-INFO README.md docs $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
diff --git a/python/python3-installer/python3-installer.info b/python/python3-installer/python3-installer.info
deleted file mode 100644
index 5969ab6d7ef..00000000000
--- a/python/python3-installer/python3-installer.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-installer"
-VERSION="0.7.0"
-HOMEPAGE="https://github.com/pypa/installer"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/i/installer/installer-0.7.0.tar.gz"
-MD5SUM="d961d1105c9270049528b1167ed021bc"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-flit_core"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/python3-installer/slack-desc b/python/python3-installer/slack-desc
deleted file mode 100644
index 23af788c6b3..00000000000
--- a/python/python3-installer/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 ':'.
-
-                 |-----handy-ruler------------------------------------------------------|
-python3-installer: python3-installer (Library for installing Python packages from wheels)
-python3-installer:
-python3-installer: This is a low-level library for installing a Python package from a
-python3-installer: wheel distribution. It provides basic functionality and abstractions
-python3-installer: for handling wheels and installing packages from wheels.
-python3-installer:
-python3-installer: Homepage: https://github.com/pypa/installer
-python3-installer:
-python3-installer:
-python3-installer:
-python3-installer:
diff --git a/python/python3-lxml/README b/python/python3-lxml/README
deleted file mode 100644
index 09ea99ca99c..00000000000
--- a/python/python3-lxml/README
+++ /dev/null
@@ -1,5 +0,0 @@
-lxml is the most feature-rich and easy-to-use library for processing
-XML and HTML in the Python language. It's also very fast and memory
-friendly, just so you know.
-
-This can coexist with python2-lxml without issue.
diff --git a/python/python3-lxml/python3-lxml.SlackBuild b/python/python3-lxml/python3-lxml.SlackBuild
deleted file mode 100644
index 21c7158367e..00000000000
--- a/python/python3-lxml/python3-lxml.SlackBuild
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-lxml
-
-# Based on Slackware build script for lxml
-# Copyright 2009-2019 Larry Hajali 
-
-# Copyright 2024 Jeremy Hansen  
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-lxml
-SRCNAM=lxml
-VERSION=${VERSION:-5.3.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-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 $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-python3 setup.py install --with-unicode-strings --root=$PKG
-
-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
-cp -a \
-  CHANGES.txt CREDITS.txt LICENSE*.txt README.rst doc/FAQ.txt \
-  $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
diff --git a/python/python3-lxml/python3-lxml.info b/python/python3-lxml/python3-lxml.info
deleted file mode 100644
index a5f7f6bf7c7..00000000000
--- a/python/python3-lxml/python3-lxml.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-lxml"
-VERSION="5.3.0"
-HOMEPAGE="https://lxml.de/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/l/lxml/lxml-5.3.0.tar.gz"
-MD5SUM="d3e6f800f4b73f2756663cc4a76df5e0"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="BeautifulSoup4 html5lib python3-cssselect"
-MAINTAINER="Jeremy Hansen"
-EMAIL="jebrhansen+SBo@gmail.com"
diff --git a/python/python3-lxml/slack-desc b/python/python3-lxml/slack-desc
deleted file mode 100644
index 470095bb6a4..00000000000
--- a/python/python3-lxml/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------------------------------------------------------|
-python3-lxml: python3-lxml (The lxml XML toolkit for Python)
-python3-lxml:
-python3-lxml: lxml is the most feature-rich and easy-to-use library for processing
-python3-lxml: XML and HTML in the Python language. It's also very fast and memory
-python3-lxml: friendly, just so you know.
-python3-lxml:
-python3-lxml: Homepage: https://lxml.de/
-python3-lxml:
-python3-lxml:
-python3-lxml:
-python3-lxml:
diff --git a/python/python3-meson-opt/README b/python/python3-meson-opt/README
deleted file mode 100644
index e72ffb354ba..00000000000
--- a/python/python3-meson-opt/README
+++ /dev/null
@@ -1,18 +0,0 @@
-python3-meson-opt (meson installed to /opt)
-
-Meson is a cross-platform build system designed to be both as fast and
-as user friendly as possible. It supports many languages and
-compilers, including GCC, Clang, PGI, Intel, and Visual Studio. Its
-build definitions are written in a simple non-Turing complete DSL.
-
-NOTE: 
-  Install bin and docs to /opt/meson
-  Installs module to /opt/python$PYVER/site-packages
-
-Add the following before the python3 build commands in your
-Slackbuild to use this version over the stock one in 15.0.  My testing
-has shown the newer meson bin does not need to be added to PATH, but
-YMMV:
-
-PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
-export PYTHONPATH=/opt/python$PYVER/site-packages
diff --git a/python/python3-meson-opt/python3-meson-opt.SlackBuild b/python/python3-meson-opt/python3-meson-opt.SlackBuild
deleted file mode 100644
index 90acdf3f8d4..00000000000
--- a/python/python3-meson-opt/python3-meson-opt.SlackBuild
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-meson-opt
-
-# Copyright 2023-2024  fourtysixandtwo 
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-meson-opt
-SRCNAM=meson
-VERSION=${VERSION:-1.6.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-ARCH=noarch
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \+
-
-PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" -p "opt/meson" dist/*.whl
-
-if [ "$PKG/opt/" != "/opt/" ]; then
-  mkdir -p $PKG/opt
-  mv $PKG/opt/meson/lib*/python$PYVER $PKG/opt/
-  rmdir $PKG/opt/meson/lib*
-fi
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a contributing.md COPYING PKG-INFO README* $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
diff --git a/python/python3-meson-opt/python3-meson-opt.info b/python/python3-meson-opt/python3-meson-opt.info
deleted file mode 100644
index 74a2acccaea..00000000000
--- a/python/python3-meson-opt/python3-meson-opt.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-meson-opt"
-VERSION="1.6.0"
-HOMEPAGE="https://github.com/mesonbuild/meson"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/m/meson/meson-1.6.0.tar.gz"
-MD5SUM="0031ea392f8ef97eeadfe1906c5cc5b4"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-build python3-wheel"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/python3-meson-opt/slack-desc b/python/python3-meson-opt/slack-desc
deleted file mode 100644
index 3654d338692..00000000000
--- a/python/python3-meson-opt/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------------------------------------------------------|
-python3-meson-opt: python3-meson-opt (meson installed to /opt)
-python3-meson-opt:
-python3-meson-opt: Meson is a cross-platform build system designed to be both as fast and
-python3-meson-opt: as user friendly as possible. It supports many languages and
-python3-meson-opt: compilers, including GCC, Clang, PGI, Intel, and Visual Studio. Its
-python3-meson-opt: build definitions are written in a simple non-Turing complete DSL.
-python3-meson-opt:
-python3-meson-opt: Installs to /opt/python$PYVER/site-packages
-python3-meson-opt:
-python3-meson-opt: Project URL: https://github.com/mesonbuild/meson
-python3-meson-opt:
diff --git a/python/python3-opencv/no-ADE-download.diff b/python/python3-opencv/no-ADE-download-4.10.0.84.diff
similarity index 76%
rename from python/python3-opencv/no-ADE-download.diff
rename to python/python3-opencv/no-ADE-download-4.10.0.84.diff
index 8c72d9660f4..06c7d1eb363 100644
--- a/python/python3-opencv/no-ADE-download.diff
+++ b/python/python3-opencv/no-ADE-download-4.10.0.84.diff
@@ -1,9 +1,9 @@
---- opencv/modules/gapi/cmake/DownloadADE.cmake.orig	2022-03-04 16:48:17.000000000 +1000
-+++ opencv/modules/gapi/cmake/DownloadADE.cmake	2024-08-19 23:51:02.079316762 +1000
+--- opencv/modules/gapi/cmake/DownloadADE.cmake.orig	2024-06-18 03:55:33.000000000 +1000
++++ opencv/modules/gapi/cmake/DownloadADE.cmake	2024-08-20 18:52:27.309000000 +1000
 @@ -2,20 +2,20 @@
- set(ade_filename "v0.1.1f.zip")
- set(ade_subdir "ade-0.1.1f")
- set(ade_md5 "b624b995ec9c439cbc2e9e6ee940d3a2")
+ set(ade_filename "v0.1.2d.zip")
+ set(ade_subdir "ade-0.1.2d")
+ set(ade_md5 "dbb095a8bf3008e91edbbf45d8d34885")
 -ocv_download(FILENAME ${ade_filename}
 -             HASH ${ade_md5}
 -             URL
diff --git a/python/python3-opencv/python3-opencv.SlackBuild b/python/python3-opencv/python3-opencv.SlackBuild
index 487f7d22060..709a93f8642 100644
--- a/python/python3-opencv/python3-opencv.SlackBuild
+++ b/python/python3-opencv/python3-opencv.SlackBuild
@@ -25,8 +25,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=python3-opencv
-VERSION=${VERSION:-4.5.5.64}
-ADEVERSION=${ADEVERSION:-0.1.1f}
+VERSION=${VERSION:-4.10.0.84}
+ADEVERSION=${ADEVERSION:-0.1.2d}
 SRCNAM=opencv-python
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -63,7 +63,7 @@ cd $SRCNAM-$VERSION
 patch -p0 < $CWD/sync_with_sci-build-$VERSION.diff
 
 # Provide local ADE rather than download during build
-patch -p0 < $CWD/no-ADE-download.diff
+patch -p0 < $CWD/no-ADE-download-$VERSION.diff
 ADE_DIR=_skbuild/linux-${ARCH/i586/i686}-$PYVER/cmake-build/3rdparty/ade
 mkdir -p $ADE_DIR
 cd $ADE_DIR
diff --git a/python/python3-opencv/python3-opencv.info b/python/python3-opencv/python3-opencv.info
index 2aba4680b23..f9324f48a2e 100644
--- a/python/python3-opencv/python3-opencv.info
+++ b/python/python3-opencv/python3-opencv.info
@@ -1,10 +1,10 @@
 PRGNAM="python3-opencv"
-VERSION="4.5.5.64"
+VERSION="4.10.0.84"
 HOMEPAGE="https://pypi.org/project/opencv-python"
-DOWNLOAD="https://files.pythonhosted.org/packages/3c/61/ee4496192ed27f657532fdf0d814b05b9787e7fc5122ed3ca57282bae69c/opencv-python-4.5.5.64.tar.gz \
-	https://github.com/opencv/ade/archive/refs/tags/v0.1.1f/ade-0.1.1f.zip"
-MD5SUM="428bc4ea8ef33cb88b9b7c721fa92bb4 \
-	b624b995ec9c439cbc2e9e6ee940d3a2"
+DOWNLOAD="https://files.pythonhosted.org/packages/4a/e7/b70a2d9ab205110d715906fc8ec83fbb00404aeb3a37a0654fdb68eb0c8c/opencv-python-4.10.0.84.tar.gz \
+	https://github.com/opencv/ade/archive/refs/tags/v0.1.2d/ade-0.1.2d.zip"
+MD5SUM="8b65f9d0d3f5a056a4461f6b38d00be4 \
+	dbb095a8bf3008e91edbbf45d8d34885"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-numpy scikit-build"
diff --git a/python/python3-opencv/sync_with_sci-build-4.5.5.64.diff b/python/python3-opencv/sync_with_sci-build-4.5.5.64.diff
deleted file mode 100644
index 5c9788aee56..00000000000
--- a/python/python3-opencv/sync_with_sci-build-4.5.5.64.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- setup.py.orig	2022-03-04 16:47:38.000000000 +1000
-+++ setup.py	2024-08-16 19:58:40.508399337 +1000
-@@ -23,13 +23,6 @@
-     build_java = "ON" if get_build_env_var_by_name("java") else "OFF"
- 
-     install_requires = [
--        'numpy>=1.13.3; python_version<"3.7"',
--        'numpy>=1.14.5; python_version>="3.7"',
--        'numpy>=1.17.3; python_version>="3.8"',
--        'numpy>=1.19.3; python_version>="3.9"',
--        'numpy>=1.21.2; python_version>="3.10"',
--        'numpy>=1.19.3; python_version>="3.6" and platform_system=="Linux" and platform_machine=="aarch64"',
--        'numpy>=1.21.2; python_version>="3.6" and platform_system=="Darwin" and platform_machine=="arm64"',
-     ]
- 
-     python_version = cmaker.CMaker.get_python_version()
-@@ -451,7 +444,7 @@
-             data_files,
-             # To get around a check that prepends source dir to paths and breaks package detection code.
-             cmake_source_dir="",
--            cmake_install_dir=cmake_install_reldir,
-+            _cmake_install_dir=cmake_install_reldir,
-         )
- 
- 
diff --git a/python/python3-pandas/python3-pandas.SlackBuild b/python/python3-pandas/python3-pandas.SlackBuild
index daa78102130..562b033ca3f 100644
--- a/python/python3-pandas/python3-pandas.SlackBuild
+++ b/python/python3-pandas/python3-pandas.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=python3-pandas
 SRCNAM=pandas
-VERSION=${VERSION:-2.1.4}
+VERSION=${VERSION:-2.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -71,13 +71,14 @@ sed -i '/oldest-supported-numpy/d' pyproject.toml
 # convert to minimum req'd instead of pinned
 sed -i 's/meson-python==/meson-python>=/' pyproject.toml
 sed -i 's/meson==/meson>=/' pyproject.toml
+sed -i 's/Cython==/Cython>=/' pyproject.toml
 
 # needs newer meson
 PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
 export PYTHONPATH=/opt/python$PYVER/site-packages/
 
 # cannot build sdist, specify just wheel
-python3 -m build --wheel --no-isolation
+python3 -m build --wheel --no-isolation --skip-dependency-check
 python3 -m installer -d "$PKG" dist/*.whl
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/python/python3-pandas/python3-pandas.info b/python/python3-pandas/python3-pandas.info
index 45852698ca1..7da538ecc13 100644
--- a/python/python3-pandas/python3-pandas.info
+++ b/python/python3-pandas/python3-pandas.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-pandas"
-VERSION="2.1.4"
+VERSION="2.2.2"
 HOMEPAGE="https://pandas.pydata.org"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pandas/pandas-2.1.4.tar.gz"
-MD5SUM="e4b598d1e0aac2a3407ed32added3f62"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pandas/pandas-2.2.2.tar.gz"
+MD5SUM="bf8a13630a85552b8c10c3d038a6524e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-numpy python3-dateutil python3-pytz tzdata python3-versioneer"
diff --git a/python/python3-pathspec/README b/python/python3-pathspec/README
deleted file mode 100644
index 9d82dd16247..00000000000
--- a/python/python3-pathspec/README
+++ /dev/null
@@ -1,6 +0,0 @@
-python3-pathspec (Library for gitignore style matching of file paths)
-
-pathspec is a utility library for pattern matching of file paths. So
-far this only includes Git's wildmatch pattern matching which itself
-is derived from Rsync's wildmatch. Git uses wildmatch for its
-gitignore files.
diff --git a/python/python3-pathspec/python3-pathspec.SlackBuild b/python/python3-pathspec/python3-pathspec.SlackBuild
deleted file mode 100644
index 33d07db20e5..00000000000
--- a/python/python3-pathspec/python3-pathspec.SlackBuild
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-pathspec
-
-# Copyright 2022-23  fourtysixandtwo 
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-pathspec
-SRCNAM=${PRGNAM#python3-*}
-VERSION=${VERSION:-0.12.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z
-cd $SRCNAM-$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 {} \+
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a LICENSE README.rst $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
diff --git a/python/python3-pathspec/python3-pathspec.info b/python/python3-pathspec/python3-pathspec.info
deleted file mode 100644
index 91716e25c4d..00000000000
--- a/python/python3-pathspec/python3-pathspec.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-pathspec"
-VERSION="0.12.1"
-HOMEPAGE="https://github.com/cpburnz/python-pathspec"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pathspec/pathspec-0.12.1.tar.gz"
-MD5SUM="2b26ad1981bfa23748e115f00085624c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-build"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/python3-pathspec/slack-desc b/python/python3-pathspec/slack-desc
deleted file mode 100644
index e0349b555b3..00000000000
--- a/python/python3-pathspec/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------------------------------------------------------|
-python3-pathspec: python3-pathspec (Library for gitignore style matching of file paths)
-python3-pathspec:
-python3-pathspec: pathspec is a utility library for pattern matching of file paths. So
-python3-pathspec: far this only includes Git's wildmatch pattern matching which itself
-python3-pathspec: is derived from Rsync's wildmatch. Git uses wildmatch for its
-python3-pathspec: gitignore files.
-python3-pathspec:
-python3-pathspec:
-python3-pathspec: Homepage: https://github.com/cpburnz/python-pathspec
-python3-pathspec:
-python3-pathspec:
diff --git a/python/python3-pluggy/README b/python/python3-pluggy/README
deleted file mode 100644
index e446501433e..00000000000
--- a/python/python3-pluggy/README
+++ /dev/null
@@ -1,6 +0,0 @@
-pluggy (mechanisms for python)
-
-This is the plugin manager as used by pytest but stripped of pytest
-specific details.
-
-This is the Python 3 build of pluggy.
diff --git a/python/python3-pluggy/python3-pluggy.SlackBuild b/python/python3-pluggy/python3-pluggy.SlackBuild
deleted file mode 100644
index 07760a76970..00000000000
--- a/python/python3-pluggy/python3-pluggy.SlackBuild
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-pluggy
-
-# Copyright 2022 Isaac Yu 
-# Copyright 2023-2024 Jeremy Hansen 
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-pluggy
-SRCNAM=pluggy
-VERSION=${VERSION:-1.5.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \;
-
-python3 setup.py install --root=$PKG
-
-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
-cp -a CHANGELOG.rst LICENSE README.rst $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
diff --git a/python/python3-pluggy/python3-pluggy.info b/python/python3-pluggy/python3-pluggy.info
deleted file mode 100644
index 5dc907446d5..00000000000
--- a/python/python3-pluggy/python3-pluggy.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-pluggy"
-VERSION="1.5.0"
-HOMEPAGE="https://github.com/pytest-dev/pluggy"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pluggy/pluggy-1.5.0.tar.gz"
-MD5SUM="ac0870be78ba0ee227a5c3955efeba59"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Jeremy Hansen"
-EMAIL="jebrhansen+SBo@gmail.com"
diff --git a/python/python3-pluggy/slack-desc b/python/python3-pluggy/slack-desc
deleted file mode 100644
index 3b042787dc4..00000000000
--- a/python/python3-pluggy/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------------------------------------------------------|
-python3-pluggy: python3-pluggy (mechanisms for python)
-python3-pluggy:
-python3-pluggy: This is the plugin manager as used by pytest but stripped of pytest
-python3-pluggy: specific details.
-python3-pluggy:
-python3-pluggy: Homepage: https://github.com/pytest-dev/pluggy
-python3-pluggy:
-python3-pluggy:
-python3-pluggy:
-python3-pluggy:
-python3-pluggy:
diff --git a/python/python3-psutil/README b/python/python3-psutil/README
deleted file mode 100644
index 8bc631773bf..00000000000
--- a/python/python3-psutil/README
+++ /dev/null
@@ -1,6 +0,0 @@
-python3-psutil is a module providing an interface for retrieving
-information on all running processes and system utilization (CPU,
-memory, disks, network, users) in a portable way by using Python,
-implementing many functionalities offered by command line tools such
-as: ps, top, df, kill, free, lsof, netstat, ifconfig, nice, ionice,
-iostat, iotop, uptime, pidof, tty, who, taskset, and pmap.
diff --git a/python/python3-psutil/python3-psutil.SlackBuild b/python/python3-psutil/python3-psutil.SlackBuild
deleted file mode 100644
index ed58d86980b..00000000000
--- a/python/python3-psutil/python3-psutil.SlackBuild
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-psutil
-
-# Copyright 2022-2024  fourtysixandtwo 
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-psutil
-SRCNAM=${PRGNAM#python3-*}
-VERSION=${VERSION:-6.1.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \+
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a CREDITS LICENSE {HISTORY,README}.rst $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
diff --git a/python/python3-psutil/python3-psutil.info b/python/python3-psutil/python3-psutil.info
deleted file mode 100644
index a1ccd047279..00000000000
--- a/python/python3-psutil/python3-psutil.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-psutil"
-VERSION="6.1.0"
-HOMEPAGE="https://github.com/giampaolo/psutil"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/p/psutil/psutil-6.1.0.tar.gz"
-MD5SUM="2baae02411c42c185e129c3f26030079"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-build python3-wheel"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/python3-psutil/slack-desc b/python/python3-psutil/slack-desc
deleted file mode 100644
index c1cdca097f7..00000000000
--- a/python/python3-psutil/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------------------------------------------------------|
-python3-psutil: python3-psutil (python interface for process and system info)
-python3-psutil:
-python3-psutil: psutil is a module providing an interface for retrieving information
-python3-psutil: on all running processes and system utilization (CPU, memory, disks,
-python3-psutil: network, users) in a portable way by using Python, implementing many
-python3-psutil: functionalities offered by command line tools such as: ps, top, df,
-python3-psutil: kill, free, lsof, netstat, ifconfig, nice, ionice, iostat, iotop,
-python3-psutil: uptime, pidof, tty, who, taskset, and pmap
-python3-psutil:
-python3-psutil: Homepage: https://github.com/giampaolo/psutil
-python3-psutil:
diff --git a/python/python3-pyproject-hooks/README b/python/python3-pyproject-hooks/README
deleted file mode 100644
index dfa06b5179c..00000000000
--- a/python/python3-pyproject-hooks/README
+++ /dev/null
@@ -1,9 +0,0 @@
-python3-pyproject-hooks (Wrappers to call PEP 517 build backend hooks)
-
-This is a low-level library for calling build-backends in
-pyproject.toml-based project. It provides the basic functionality to
-help write tooling that generates distribution files from
-Python projects.
-
-The pep517 project has been replaced by this project (low level) and
-the build project (high level).
diff --git a/python/python3-pyproject-hooks/python3-pyproject-hooks.SlackBuild b/python/python3-pyproject-hooks/python3-pyproject-hooks.SlackBuild
deleted file mode 100644
index 342c1ed6754..00000000000
--- a/python/python3-pyproject-hooks/python3-pyproject-hooks.SlackBuild
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-pyproject-hooks
-
-# Copyright 2023-2024  fourtysixandtwo 
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-pyproject-hooks
-SRCNAM=pyproject_hooks
-VERSION=${VERSION:-1.2.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \+
-
-python3 -m flit_core.wheel
-python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a \
-  PKG-INFO \
-  README.rst \
-  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
diff --git a/python/python3-pyproject-hooks/python3-pyproject-hooks.info b/python/python3-pyproject-hooks/python3-pyproject-hooks.info
deleted file mode 100644
index 91bbe9f0699..00000000000
--- a/python/python3-pyproject-hooks/python3-pyproject-hooks.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-pyproject-hooks"
-VERSION="1.2.0"
-HOMEPAGE="https://github.com/pypa/pyproject-hooks"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/p/pyproject_hooks/pyproject_hooks-1.2.0.tar.gz"
-MD5SUM="ed3dd1b984339e83e35f676d7169c192"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-installer"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/python3-pyproject-hooks/slack-desc b/python/python3-pyproject-hooks/slack-desc
deleted file mode 100644
index 57fe2f95346..00000000000
--- a/python/python3-pyproject-hooks/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------------------------------------------------------|
-python3-pyproject-hooks: python3-pyproject-hooks (Wrappers to call PEP 517 build backend hooks)
-python3-pyproject-hooks:
-python3-pyproject-hooks: This is a low-level library for calling build-backends in
-python3-pyproject-hooks: pyproject.toml-based project. It provides the basic functionality to
-python3-pyproject-hooks: help write tooling that generates distribution files from
-python3-pyproject-hooks: Python projects.
-python3-pyproject-hooks:
-python3-pyproject-hooks: The pep517 project has been replaced by this project (low level) and
-python3-pyproject-hooks: the build project (high level).
-python3-pyproject-hooks:
-python3-pyproject-hooks: Homepage: https://github.com/pypa/pyproject-hooks
diff --git a/python/python3-setuptools-opt/README b/python/python3-setuptools-opt/README
deleted file mode 100644
index 5b65d6ba0b2..00000000000
--- a/python/python3-setuptools-opt/README
+++ /dev/null
@@ -1,12 +0,0 @@
-python3-setuptools-opt (Install newer setuptools in /opt)
-
-Setuptools is a fully-featured, actively-maintained, and stable
-library designed to facilitate packaging Python projects.
-
-Installs to /opt/python$PYVER/site-packages.
-
-Add the following before the python3 build commands in your
-Slackbuild to use this version over the stock one in 15.0:
-
-PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
-export PYTHONPATH=/opt/python$PYVER/site-packages
diff --git a/python/python3-setuptools-opt/python3-setuptools-opt.SlackBuild b/python/python3-setuptools-opt/python3-setuptools-opt.SlackBuild
deleted file mode 100644
index 55e0c220d54..00000000000
--- a/python/python3-setuptools-opt/python3-setuptools-opt.SlackBuild
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-setuptools-opt
-
-# Copyright 2023-2024  fourtysixandtwo 
-# Copyright 2013-2014 Audrius Kažukauskas 
-# Copyright 2014, 2017, 2018, 2022  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-setuptools-opt
-SRCNAM=setuptools
-VERSION=${VERSION:-75.6.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "aarch64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \+
-
-rm -f setuptools/*.exe
-
-# Recent Python versions support both a libdir (for pure Python modules) and a
-# platlib (for $ARCH specific modules). We've always patched Python to use
-# the platform directory (such as /usr/lib64/python$PYVER/site-packages on x86_64)
-# for all modules. Perhaps we will rethink this, but since an installed
-# setuptools now takes priority for reporting the libdir (and this no longer
-# matches the platlib on architectures such as x86_64), let's patch setuptools
-# to agree with Python:
-if [ "$LIBDIRSUFFIX" = "64" ]; then
-  zcat $CWD/setuptools.x86_64.diff.gz | patch -p1 --verbose || exit 1
-fi
-
-PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
-export PYTHONPATH=/opt/python$PYVER/site-packages
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" dist/*.whl
-
-if [ "$PKG/usr/" != "/usr/" ]; then
-  mkdir -p $PKG/opt
-  mv $PKG/usr/lib*/python$PYVER $PKG/opt/
-  rmdir $PKG/usr/lib*
-else
-  echo "ERROR: \$PKG is not set! We don't want to move the real /usr/lib*/python$PYVER"
-  exit 1
-fi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a NEWS.rst LICENSE PKG-INFO README.rst \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-# If there's a docs/history.rst, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r docs/history.rst ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/${PRGNAM}-$VERSION)
-  cat docs/history.rst | head -n 1000 > $DOCSDIR/history.rst
-  touch -r docs/history.rst $DOCSDIR/history.rst
-fi
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/python/python3-setuptools-opt/python3-setuptools-opt.info b/python/python3-setuptools-opt/python3-setuptools-opt.info
deleted file mode 100644
index ee9e0f1491f..00000000000
--- a/python/python3-setuptools-opt/python3-setuptools-opt.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-setuptools-opt"
-VERSION="75.6.0"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/s/setuptools/setuptools-75.6.0.tar.gz"
-MD5SUM="94458e508bd8e9dc6e6d097fc8747cf0"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-packaging-opt python3-wheel"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/python3-setuptools-opt/setuptools.x86_64.diff.gz b/python/python3-setuptools-opt/setuptools.x86_64.diff.gz
deleted file mode 100644
index a04992ad753..00000000000
Binary files a/python/python3-setuptools-opt/setuptools.x86_64.diff.gz and /dev/null differ
diff --git a/python/python3-setuptools-opt/slack-desc b/python/python3-setuptools-opt/slack-desc
deleted file mode 100644
index 53ddd75f55b..00000000000
--- a/python/python3-setuptools-opt/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------------------------------------------------------|
-python3-setuptools-opt: python3-setuptools-opt (Install setuptools from -current in /opt)
-python3-setuptools-opt:
-python3-setuptools-opt: Setuptools is a fully-featured, actively-maintained, and stable
-python3-setuptools-opt: library designed to facilitate packaging Python projects.
-python3-setuptools-opt:
-python3-setuptools-opt: Installs to /opt/python$PYVER/site-packages
-python3-setuptools-opt:
-python3-setuptools-opt:
-python3-setuptools-opt: Project URL: https://pypi.org/project/setuptools/
-python3-setuptools-opt:
-python3-setuptools-opt:
diff --git a/python/python3-setuptools-scm-opt/README b/python/python3-setuptools-scm-opt/README
deleted file mode 100644
index 9affc3e333a..00000000000
--- a/python/python3-setuptools-scm-opt/README
+++ /dev/null
@@ -1,17 +0,0 @@
-python3-setuptools-scm-opt (setuptools-scm installed to /opt)
-
-setuptools_scm extracts Python package versions from git or hg
-metadata instead of declaring them as the version argument or in a SCM
-managed file.
-
-# Build your package with this version to fix errors like the following:
-ImportError: cannot import name '__version__' from ...
-
-NOTE:
-Installs to /opt/python$PYVER/site-packages
-
-Add the following before the python3 build commands in your
-Slackbuild to use this version over the stock one in 15.0:
-
-PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
-export PYTHONPATH=/opt/python$PYVER/site-packages
diff --git a/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.SlackBuild b/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.SlackBuild
deleted file mode 100644
index ff9895deaf2..00000000000
--- a/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.SlackBuild
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-setuptools-scm-opt
-
-# Copyright 2023-2024  fourtysixandtwo 
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-setuptools-scm-opt
-SRCNAM=setuptools-scm
-VERSION=${VERSION:-8.0.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-# set noarch because installing to /opt
-ARCH=noarch
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \+
-
-PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
-export PYTHONPATH=/opt/python$PYVER/site-packages
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" dist/*.whl
-
-if [ "$PKG/usr/" != "/usr/" ]; then
-  mkdir -p $PKG/opt
-  mv $PKG/usr/lib*/python$PYVER $PKG/opt/
-  rmdir $PKG/usr/lib*
-else
-  echo "ERROR: \$PKG is not set! We don't want to move the real /usr/lib*/python$PYVER"
-  exit 1
-fi
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG.rst LICENSE README.md PKG-INFO $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
diff --git a/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.info b/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.info
deleted file mode 100644
index 6d677c69efb..00000000000
--- a/python/python3-setuptools-scm-opt/python3-setuptools-scm-opt.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-setuptools-scm-opt"
-VERSION="8.0.2"
-HOMEPAGE="https://github.com/pypa/setuptools-scm"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/s/setuptools_scm/setuptools-scm-8.0.2.tar.gz"
-MD5SUM="036efc8cbff77f9ba420225c4807e938"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-typing-extensions python3-rich python-importlib_metadata"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/python3-setuptools-scm-opt/slack-desc b/python/python3-setuptools-scm-opt/slack-desc
deleted file mode 100644
index 5a43ac05489..00000000000
--- a/python/python3-setuptools-scm-opt/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------------------------------------------------------|
-python3-setuptools-scm-opt: python3-setuptools-scm-opt (setuptools-scm installed to /opt)
-python3-setuptools-scm-opt:
-python3-setuptools-scm-opt: setuptools_scm extracts Python package versions from git or hg
-python3-setuptools-scm-opt: metadata instead of declaring them as the version argument or in a SCM
-python3-setuptools-scm-opt: managed file.
-python3-setuptools-scm-opt:
-python3-setuptools-scm-opt:
-python3-setuptools-scm-opt:
-python3-setuptools-scm-opt:
-python3-setuptools-scm-opt: Homepage: https://github.com/pypa/setuptools_scm
-python3-setuptools-scm-opt:
diff --git a/python/python3-tomli_w/README b/python/python3-tomli_w/README
deleted file mode 100644
index ed35b90bb14..00000000000
--- a/python/python3-tomli_w/README
+++ /dev/null
@@ -1,5 +0,0 @@
-python3-tomli_w (A lil TOML writer)
-
-Tomli-W is a Python library for writing TOML. It is a write-only 
-counterpart to Tomli, which is a read-only TOML parser. Tomli-W is 
-fully compatible with TOML v1.0.0.
diff --git a/python/python3-tomli_w/python3-tomli_w.SlackBuild b/python/python3-tomli_w/python3-tomli_w.SlackBuild
deleted file mode 100644
index f18e2932f66..00000000000
--- a/python/python3-tomli_w/python3-tomli_w.SlackBuild
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-tomli_w
-
-# Copyright 2022-2024  fourtysixandtwo 
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-tomli_w
-SRCNAM=${PRGNAM#python3-*}
-VERSION=${VERSION:-1.1.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z
-cd $SRCNAM-$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 {} \+
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" dist/*.whl
-
-# installing tests to a subdir of your project might not conflict the toplevel, but
-# don't do it anyway...
-#rm -r "$PKG"/usr/lib${LIBDIRSUFFIX}/python*/site-packages/${SRCNAM}/tests/
-
-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
-cp -a LICENSE README.md $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
diff --git a/python/python3-tomli_w/python3-tomli_w.info b/python/python3-tomli_w/python3-tomli_w.info
deleted file mode 100644
index 274a9bba024..00000000000
--- a/python/python3-tomli_w/python3-tomli_w.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-tomli_w"
-VERSION="1.1.0"
-HOMEPAGE="https://github.com/hukkin/tomli-w"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/t/tomli_w/tomli_w-1.1.0.tar.gz"
-MD5SUM="8a074845fdcbb1fb6855bec753f0f94e"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-build"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/python3-tomli_w/slack-desc b/python/python3-tomli_w/slack-desc
deleted file mode 100644
index 6030fc98ea1..00000000000
--- a/python/python3-tomli_w/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------------------------------------------------------|
-python3-tomli_w: python3-tomli_w (A lil TOML writer)
-python3-tomli_w:
-python3-tomli_w: Tomli-W is a Python library for writing TOML. It is a write-only
-python3-tomli_w: counterpart to Tomli, which is a read-only TOML parser. Tomli-W is
-python3-tomli_w: fully compatible with TOML v1.0.0.
-python3-tomli_w:
-python3-tomli_w:
-python3-tomli_w:
-python3-tomli_w: Homepage: https://github.com/hukkin/tomli-w
-python3-tomli_w:
-python3-tomli_w:
diff --git a/python/python3-trove-classifiers/README b/python/python3-trove-classifiers/README
deleted file mode 100644
index 99c4a0202f9..00000000000
--- a/python/python3-trove-classifiers/README
+++ /dev/null
@@ -1,4 +0,0 @@
-python3-trove-classifiers (Canonical source for classifiers on PyPI)
-
-Classifiers categorize projects per PEP 301. Use this package to
-validate classifiers in packages for PyPI upload or download.
diff --git a/python/python3-trove-classifiers/python3-trove-classifiers.SlackBuild b/python/python3-trove-classifiers/python3-trove-classifiers.SlackBuild
deleted file mode 100644
index edfdac63447..00000000000
--- a/python/python3-trove-classifiers/python3-trove-classifiers.SlackBuild
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-trove-classifiers
-
-# Copyright 2023-2024  fourtysixandtwo 
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-trove-classifiers
-SRCNAM=trove_classifiers
-VERSION=${VERSION:-2024.10.21.16}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z
-cd $SRCNAM-$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 {} \+
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a CONTRIBUTING.md LICENSE README.md $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
diff --git a/python/python3-trove-classifiers/python3-trove-classifiers.info b/python/python3-trove-classifiers/python3-trove-classifiers.info
deleted file mode 100644
index 6c44b1ddf5d..00000000000
--- a/python/python3-trove-classifiers/python3-trove-classifiers.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-trove-classifiers"
-VERSION="2024.10.21.16"
-HOMEPAGE="https://github.com/pypa/trove-classifiers"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/t/trove_classifiers/trove_classifiers-2024.10.21.16.tar.gz"
-MD5SUM="c2820cfbb09e91d84ade85e0e65d87ae"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-calver"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/python3-trove-classifiers/slack-desc b/python/python3-trove-classifiers/slack-desc
deleted file mode 100644
index 7d5b42c6477..00000000000
--- a/python/python3-trove-classifiers/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------------------------------------------------------|
-python3-trove-classifiers: python3-trove-classifiers (Canonical source for classifiers on PyPI)
-python3-trove-classifiers:
-python3-trove-classifiers: Classifiers categorize projects per PEP 301. Use this package to
-python3-trove-classifiers: validate classifiers in packages for PyPI upload or download.
-python3-trove-classifiers:
-python3-trove-classifiers: Homepage: https://github.com/pypa/trove-classifiers
-python3-trove-classifiers:
-python3-trove-classifiers:
-python3-trove-classifiers:
-python3-trove-classifiers:
-python3-trove-classifiers:
diff --git a/python/python3-typogrify/README b/python/python3-typogrify/README
deleted file mode 100644
index 7b85ea97e33..00000000000
--- a/python/python3-typogrify/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Typogrify provides a set of custom filters that automatically apply
-various transformations to plain text in order to yield
-typographically-improved HTML. While often used in conjunction with
-Jinja and Django template systems, the filters can be used in any
-environment.
diff --git a/python/python3-typogrify/python3-typogrify.SlackBuild b/python/python3-typogrify/python3-typogrify.SlackBuild
deleted file mode 100644
index e504fd7071e..00000000000
--- a/python/python3-typogrify/python3-typogrify.SlackBuild
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-typogrify
-
-# Copyright 2022 Steven Voges 
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-typogrify
-SRCNAM=typogrify
-VERSION=${VERSION:-2.0.7}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \;
-
-python3 setup.py install --root=$PKG
-
-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
-cp -a \
-  LICENSE.txt PKG-INFO README.rst \
-  $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
diff --git a/python/python3-typogrify/python3-typogrify.info b/python/python3-typogrify/python3-typogrify.info
deleted file mode 100644
index 8d9d21e089b..00000000000
--- a/python/python3-typogrify/python3-typogrify.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-typogrify"
-VERSION="2.0.7"
-HOMEPAGE="https://github.com/mintchaos/typogrify"
-DOWNLOAD="https://files.pythonhosted.org/packages/8a/bf/64959d6187d42472acb846bcf462347c9124952c05bd57e5769d5f28f9a6/typogrify-2.0.7.tar.gz"
-MD5SUM="63f38f80531996f187d2894cc497ba08"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python-smartypants"
-MAINTAINER="Steven Voges"
-EMAIL="svoges.sbo@gmail.com"
diff --git a/python/python3-typogrify/slack-desc b/python/python3-typogrify/slack-desc
deleted file mode 100644
index f8a55e6af90..00000000000
--- a/python/python3-typogrify/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------------------------------------------------------|
-python3-typogrify: python3-typogrify (Text to HTML translator)
-python3-typogrify:
-python3-typogrify: A set of Django template filters to make caring about typography on
-python3-typogrify: the web a bit easier. 
-python3-typogrify:
-python3-typogrify: Homepage: https://github.com/mintchaos/typogrify
-python3-typogrify:
-python3-typogrify:
-python3-typogrify:
-python3-typogrify:
-python3-typogrify:
diff --git a/python/python3-webencodings/README b/python/python3-webencodings/README
deleted file mode 100644
index 736e9a28704..00000000000
--- a/python/python3-webencodings/README
+++ /dev/null
@@ -1,13 +0,0 @@
-webencodings is a Python implementation of the WHATWG Encoding standard.
-
-In order to be compatible with legacy web content when interpreting
-something like Content-Type: text/html; charset=latin1, tools need to
-use a particular set of aliases for encoding labels as well as some
-overriding rules. For example, US-ASCII and iso-8859-1 on the web are
-actually aliases for windows-1252, and an UTF-8 or UTF-16 BOM takes
-precedence over any other encoding declaration. The Encoding standard
-defines all such details so that implementations do not have to
-reverse-engineer each other.
-
-This module has encoding labels and BOM detection, but the actual
-implementation for encoders and decoders is Python's.
diff --git a/python/python3-webencodings/python3-webencodings.SlackBuild b/python/python3-webencodings/python3-webencodings.SlackBuild
deleted file mode 100644
index 91b1c7be845..00000000000
--- a/python/python3-webencodings/python3-webencodings.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/bash
-#
-# SlackBuild for python3-webencodings
-
-# Copyright 2021 Yth | Pont-en-Royans, France | yth@ythogtha.org
-# Copyright 2017-2021 Benjamin Trigona-Harany 
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-webencodings
-SRCNAM=python-webencodings
-VERSION=${VERSION:-0.5.1}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "aarch64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xzf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \;
-
-python3 setup.py install --root=$PKG
-
-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
-cp -a LICENSE README.rst $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
diff --git a/python/python3-webencodings/python3-webencodings.info b/python/python3-webencodings/python3-webencodings.info
deleted file mode 100644
index cdd96149bec..00000000000
--- a/python/python3-webencodings/python3-webencodings.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-webencodings"
-VERSION="0.5.1"
-HOMEPAGE="https://pythonhosted.org/webencodings/"
-DOWNLOAD="https://github.com/gsnedders/python-webencodings/archive/v0.5.1/python-webencodings-0.5.1.tar.gz"
-MD5SUM="7eb67377743cd55eaa356496c439471e"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Yth - Arnaud"
-EMAIL="yth@ythogtha.org"
diff --git a/python/python3-webencodings/slack-desc b/python/python3-webencodings/slack-desc
deleted file mode 100644
index 2b41d21154a..00000000000
--- a/python/python3-webencodings/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------------------------------------------------------|
-python3-webencodings: python3-webencodings (Character encoding for the web)
-python3-webencodings:
-python3-webencodings: webencodings is a Python implementation of the WHATWG Encoding
-python3-webencodings: standard.
-python3-webencodings:
-python3-webencodings:
-python3-webencodings:
-python3-webencodings:
-python3-webencodings:
-python3-webencodings:
-python3-webencodings:
diff --git a/python/python3-wheel/README b/python/python3-wheel/README
deleted file mode 100644
index d64f5dca0ae..00000000000
--- a/python/python3-wheel/README
+++ /dev/null
@@ -1,6 +0,0 @@
-python3-wheel (A built-package format for Python)
-
-This library is the reference implementation of the Python wheel
-packaging standard, as defined in PEP 427.
-
-Optional dependencies: python-keyring
diff --git a/python/python3-wheel/python3-wheel.SlackBuild b/python/python3-wheel/python3-wheel.SlackBuild
deleted file mode 100644
index fc207c0b691..00000000000
--- a/python/python3-wheel/python3-wheel.SlackBuild
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for python3-wheel
-
-# Copyright 2023-2024  fourtysixandtwo 
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=python3-wheel
-SRCNAM=${PRGNAM#python3-*}
-VERSION=${VERSION:-0.45.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \+
-
-python3 -m flit_core.wheel
-python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a README.rst LICENSE.txt $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
diff --git a/python/python3-wheel/python3-wheel.info b/python/python3-wheel/python3-wheel.info
deleted file mode 100644
index f765983e820..00000000000
--- a/python/python3-wheel/python3-wheel.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="python3-wheel"
-VERSION="0.45.0"
-HOMEPAGE="https://github.com/pypa/wheel"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/w/wheel/wheel-0.45.0.tar.gz"
-MD5SUM="3d1f79ff04a1252fa709dec58aa7249b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-installer"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/python3-wheel/slack-desc b/python/python3-wheel/slack-desc
deleted file mode 100644
index 2e875b97181..00000000000
--- a/python/python3-wheel/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------------------------------------------------------|
-python3-wheel: python3-wheel (A built-package format for Python)
-python3-wheel:
-python3-wheel: This library is the reference implementation of the Python wheel
-python3-wheel: packaging standard, as defined in PEP 427.
-python3-wheel:
-python3-wheel: Homepage: https://wheel.readthedocs.io
-python3-wheel:
-python3-wheel:
-python3-wheel:
-python3-wheel:
-python3-wheel:
diff --git a/python/snowballstemmer/snowballstemmer.SlackBuild b/python/snowballstemmer/snowballstemmer.SlackBuild
index 805761b5991..7e3a58571dc 100644
--- a/python/snowballstemmer/snowballstemmer.SlackBuild
+++ b/python/snowballstemmer/snowballstemmer.SlackBuild
@@ -81,7 +81,6 @@ find -L . \
 
 # Build
 python setup.py install --root=$PKG
-python3 setup.py install --root=$PKG
 
 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
diff --git a/python/sphinx-rtd-theme/README b/python/sphinx-rtd-theme/README
deleted file mode 100644
index 6612eac0f66..00000000000
--- a/python/sphinx-rtd-theme/README
+++ /dev/null
@@ -1,7 +0,0 @@
-The sphinx_rtd_theme is a sphinx theme designed to look modern and be
-mobile-friendly. 
-
-This theme is primarily focused to be used on readthedocs.org but can
-work with your own sphinx projects.
-
-To read more and see a working demo head over to readthedocs.org.
diff --git a/python/sphinx-rtd-theme/slack-desc b/python/sphinx-rtd-theme/slack-desc
deleted file mode 100644
index b8e2b0cd257..00000000000
--- a/python/sphinx-rtd-theme/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------------------------------------------------------|
-sphinx-rtd-theme: sphinx-rtd-theme (decorator for caching properties in classes)
-sphinx-rtd-theme:
-sphinx-rtd-theme: The sphinx_rtd_theme is a sphinx theme designed to look modern and be
-sphinx-rtd-theme: mobile-friendly.
-sphinx-rtd-theme:
-sphinx-rtd-theme:
-sphinx-rtd-theme: Homepage: https://pypi.org/project/sphinx-rtd-theme
-sphinx-rtd-theme:
-sphinx-rtd-theme:
-sphinx-rtd-theme:
-sphinx-rtd-theme:
diff --git a/python/sphinx-rtd-theme/sphinx-rtd-theme.SlackBuild b/python/sphinx-rtd-theme/sphinx-rtd-theme.SlackBuild
deleted file mode 100644
index 2a8ceb724df..00000000000
--- a/python/sphinx-rtd-theme/sphinx-rtd-theme.SlackBuild
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-# SlackBuild build script for sphinx_rtd_theme
-
-# Copyright 2024  fourtysixandtwo 
-# Copyright (c) 2000-2011 Pr. Horstmann 
-# 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.
-
-# 20240322 46and2: Updated version, new maintainer.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=sphinx-rtd-theme
-VERSION=${VERSION:-2.0.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-SRCNAM=$( printf $PRGNAM | tr - _ )
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \+
-
-python3 setup.py install --root=$PKG
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README.rst $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
diff --git a/python/sphinx-rtd-theme/sphinx-rtd-theme.info b/python/sphinx-rtd-theme/sphinx-rtd-theme.info
deleted file mode 100644
index fe6c57ad958..00000000000
--- a/python/sphinx-rtd-theme/sphinx-rtd-theme.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="sphinx-rtd-theme"
-VERSION="2.0.0"
-HOMEPAGE="https://pypi.org/project/sphinx-rtd-theme"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinx_rtd_theme/sphinx_rtd_theme-2.0.0.tar.gz"
-MD5SUM="8ad74a8e9ca706ed77117be0e9eed7e8"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="sphinxcontrib-jquery"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/sphinxcontrib-applehelp/README b/python/sphinxcontrib-applehelp/README
deleted file mode 100644
index eda7fa9b74f..00000000000
--- a/python/sphinxcontrib-applehelp/README
+++ /dev/null
@@ -1,2 +0,0 @@
-sphinxcontrib-applehelp is a Sphinx extension to create Apple help
-books.
diff --git a/python/sphinxcontrib-applehelp/slack-desc b/python/sphinxcontrib-applehelp/slack-desc
deleted file mode 100644
index 5a5f5187168..00000000000
--- a/python/sphinxcontrib-applehelp/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------------------------------------------------------|
-sphinxcontrib-applehelp: sphinxcontrib-applehelp (Sphinx extension)
-sphinxcontrib-applehelp:
-sphinxcontrib-applehelp: sphinxcontrib-applehelp is a Sphinx extension to create Apple help
-sphinxcontrib-applehelp: books.
-sphinxcontrib-applehelp:
-sphinxcontrib-applehelp:
-sphinxcontrib-applehelp:
-sphinxcontrib-applehelp:
-sphinxcontrib-applehelp:
-sphinxcontrib-applehelp:
-sphinxcontrib-applehelp:
diff --git a/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.SlackBuild b/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.SlackBuild
deleted file mode 100644
index a6744d52f71..00000000000
--- a/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.SlackBuild
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for sphinxcontrib-applehelp
-
-# Copyright 2024  fourtysixandtwo 
-# Copyright 2019-2021 Benjamin Trigona-Harany 
-# 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.
-
-# 20240101 46and2: Updated version, new maintainer.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=sphinxcontrib-applehelp
-SRCNAM=sphinxcontrib_applehelp
-VERSION=${VERSION:-2.0.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \+
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a \
-  CHANGES.rst LICENCE.rst README.rst \
-  $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
diff --git a/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.info b/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.info
deleted file mode 100644
index c2bbb9b9def..00000000000
--- a/python/sphinxcontrib-applehelp/sphinxcontrib-applehelp.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="sphinxcontrib-applehelp"
-VERSION="2.0.0"
-HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-applehelp"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-applehelp/sphinxcontrib_applehelp-2.0.0.tar.gz"
-MD5SUM="e16bb1d6199f686d411c180e64a8e831"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-build"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/sphinxcontrib-devhelp/README b/python/sphinxcontrib-devhelp/README
deleted file mode 100644
index abffcbb5ee0..00000000000
--- a/python/sphinxcontrib-devhelp/README
+++ /dev/null
@@ -1,2 +0,0 @@
-sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp
-document.
diff --git a/python/sphinxcontrib-devhelp/slack-desc b/python/sphinxcontrib-devhelp/slack-desc
deleted file mode 100644
index b312071fe8d..00000000000
--- a/python/sphinxcontrib-devhelp/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------------------------------------------------------|
-sphinxcontrib-devhelp: sphinxcontrib-devhelp (Sphinx extension)
-sphinxcontrib-devhelp:
-sphinxcontrib-devhelp: sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp
-sphinxcontrib-devhelp: document. 
-sphinxcontrib-devhelp:
-sphinxcontrib-devhelp:
-sphinxcontrib-devhelp:
-sphinxcontrib-devhelp:
-sphinxcontrib-devhelp:
-sphinxcontrib-devhelp:
-sphinxcontrib-devhelp:
diff --git a/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.SlackBuild b/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.SlackBuild
deleted file mode 100644
index cae7939ddca..00000000000
--- a/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.SlackBuild
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for sphinxcontrib-devhelp
-
-# Copyright 2024  fourtysixandtwo 
-# Copyright 2019-2020 Benjamin Trigona-Harany 
-# 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.
-
-# 20240101 46and2: Updated version, new maintainer.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=sphinxcontrib-devhelp
-SRCNAM=sphinxcontrib_devhelp
-VERSION=${VERSION:-2.0.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \+
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a \
-  CHANGES.rst LICENCE.rst README.rst \
-  $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
diff --git a/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.info b/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.info
deleted file mode 100644
index c069a9ace80..00000000000
--- a/python/sphinxcontrib-devhelp/sphinxcontrib-devhelp.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="sphinxcontrib-devhelp"
-VERSION="2.0.0"
-HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-devhelp"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-devhelp/sphinxcontrib_devhelp-2.0.0.tar.gz"
-MD5SUM="79ef5937b8397f724f4fb065073cd24c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-build"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/sphinxcontrib-htmlhelp/README b/python/sphinxcontrib-htmlhelp/README
deleted file mode 100644
index ffefb74a48d..00000000000
--- a/python/sphinxcontrib-htmlhelp/README
+++ /dev/null
@@ -1 +0,0 @@
-sphinxcontrib-htmlhelp is a Sphinx extension to create HTML help files.
diff --git a/python/sphinxcontrib-htmlhelp/slack-desc b/python/sphinxcontrib-htmlhelp/slack-desc
deleted file mode 100644
index 41edc47af24..00000000000
--- a/python/sphinxcontrib-htmlhelp/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------------------------------------------------------|
-sphinxcontrib-htmlhelp: sphinxcontrib-htmlhelp (HTML help file generator)
-sphinxcontrib-htmlhelp:
-sphinxcontrib-htmlhelp: sphinxcontrib-htmlhelp is a Sphinx extension to create HTML help
-sphinxcontrib-htmlhelp: files.
-sphinxcontrib-htmlhelp:
-sphinxcontrib-htmlhelp:
-sphinxcontrib-htmlhelp:
-sphinxcontrib-htmlhelp:
-sphinxcontrib-htmlhelp:
-sphinxcontrib-htmlhelp:
-sphinxcontrib-htmlhelp:
diff --git a/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.SlackBuild b/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.SlackBuild
deleted file mode 100644
index 0e1453ad64d..00000000000
--- a/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.SlackBuild
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for sphinxcontrib-htmlhelp
-
-# Copyright 2024  fourtysixandtwo 
-# Copyright 2019-2021 Benjamin Trigona-Harany 
-# 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.
-
-# 20240101 46and2: Updated version, new maintainer.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=sphinxcontrib-htmlhelp
-SRCNAM=sphinxcontrib_htmlhelp
-VERSION=${VERSION:-2.1.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \+
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a \
-  CHANGES.rst LICENCE.rst README.rst \
-  $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
diff --git a/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.info b/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.info
deleted file mode 100644
index 56bd5d98c4c..00000000000
--- a/python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="sphinxcontrib-htmlhelp"
-VERSION="2.1.0"
-HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-htmlhelp"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-htmlhelp/sphinxcontrib_htmlhelp-2.1.0.tar.gz"
-MD5SUM="1326f55f6bea49ab6a846c0088bc369e"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-build"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/sphinxcontrib-jsmath/README b/python/sphinxcontrib-jsmath/README
deleted file mode 100644
index 935d4aca139..00000000000
--- a/python/sphinxcontrib-jsmath/README
+++ /dev/null
@@ -1,2 +0,0 @@
-sphinxcontrib-jsmath is a Sphinx extension which renders display math
-in HTML via JavaScript.
diff --git a/python/sphinxcontrib-jsmath/slack-desc b/python/sphinxcontrib-jsmath/slack-desc
deleted file mode 100644
index c391e43d79e..00000000000
--- a/python/sphinxcontrib-jsmath/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------------------------------------------------------|
-sphinxcontrib-jsmath: sphinxcontrib-jsmath (Sphinx extension)
-sphinxcontrib-jsmath:
-sphinxcontrib-jsmath: sphinxcontrib-jsmath is a Sphinx extension which renders display math
-sphinxcontrib-jsmath: in HTML via JavaScript
-sphinxcontrib-jsmath:
-sphinxcontrib-jsmath:
-sphinxcontrib-jsmath:
-sphinxcontrib-jsmath:
-sphinxcontrib-jsmath:
-sphinxcontrib-jsmath:
-sphinxcontrib-jsmath:
diff --git a/python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.SlackBuild b/python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.SlackBuild
deleted file mode 100644
index 710a2cf4cc7..00000000000
--- a/python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.SlackBuild
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for sphinxcontrib-jsmath
-
-# Copyright 2024  fourtysixandtwo 
-# Copyright 2019 Benjamin Trigona-Harany 
-# 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.
-
-# 20240101 46and2: New maintainer.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=sphinxcontrib-jsmath
-VERSION=${VERSION:-1.0.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-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 {} \+
-
-python3 setup.py install --root=$PKG
-
-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
-cp -a \
-  CHANGES LICENSE README.rst \
-  $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
diff --git a/python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.info b/python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.info
deleted file mode 100644
index a37ebf4e7cf..00000000000
--- a/python/sphinxcontrib-jsmath/sphinxcontrib-jsmath.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="sphinxcontrib-jsmath"
-VERSION="1.0.1"
-HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-jsmath"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.tar.gz"
-MD5SUM="e45179f0a3608b6766862e0f34c23b62"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/sphinxcontrib-qthelp/README b/python/sphinxcontrib-qthelp/README
deleted file mode 100644
index 4b2719c2d46..00000000000
--- a/python/sphinxcontrib-qthelp/README
+++ /dev/null
@@ -1,2 +0,0 @@
-sphinxcontrib-qthelp is a Sphinx extension to create QtHelp
-documentation.
diff --git a/python/sphinxcontrib-qthelp/slack-desc b/python/sphinxcontrib-qthelp/slack-desc
deleted file mode 100644
index 82af3befe03..00000000000
--- a/python/sphinxcontrib-qthelp/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------------------------------------------------------|
-sphinxcontrib-qthelp: sphinxcontrib-qthelp (QtHelp documentation generation)
-sphinxcontrib-qthelp:
-sphinxcontrib-qthelp: sphinxcontrib-qthelp is a Sphinx extension to create QtHelp
-sphinxcontrib-qthelp: documentation.
-sphinxcontrib-qthelp:
-sphinxcontrib-qthelp:
-sphinxcontrib-qthelp:
-sphinxcontrib-qthelp:
-sphinxcontrib-qthelp:
-sphinxcontrib-qthelp:
-sphinxcontrib-qthelp:
diff --git a/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.SlackBuild b/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.SlackBuild
deleted file mode 100644
index d28383379aa..00000000000
--- a/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.SlackBuild
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for sphinxcontrib-qthelp
-
-# Copyright 2024  fourtysixandtwo 
-# Copyright 2019-2020 Benjamin Trigona-Harany 
-# 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.
-
-# 20240101 46and2: Updated version, new maintainer.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=sphinxcontrib-qthelp
-SRCNAM=sphinxcontrib_qthelp
-VERSION=${VERSION:-2.0.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \+
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a \
-  CHANGES.rst LICENCE.rst README.rst \
-  $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
diff --git a/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.info b/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.info
deleted file mode 100644
index a193b74ca01..00000000000
--- a/python/sphinxcontrib-qthelp/sphinxcontrib-qthelp.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="sphinxcontrib-qthelp"
-VERSION="2.0.0"
-HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-qthelp"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-qthelp/sphinxcontrib_qthelp-2.0.0.tar.gz"
-MD5SUM="ed4f32003b71a54ac3d68aa651cb6573"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-build"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/python/sphinxcontrib-serializinghtml/README b/python/sphinxcontrib-serializinghtml/README
deleted file mode 100644
index 795e6d8f1de..00000000000
--- a/python/sphinxcontrib-serializinghtml/README
+++ /dev/null
@@ -1,2 +0,0 @@
-sphinxcontrib-serializinghtml is a sphinx extension which outputs
-"serialized" HTML files (json and pickle).
diff --git a/python/sphinxcontrib-serializinghtml/slack-desc b/python/sphinxcontrib-serializinghtml/slack-desc
deleted file mode 100644
index b056ff25a12..00000000000
--- a/python/sphinxcontrib-serializinghtml/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------------------------------------------------------|
-sphinxcontrib-serializinghtml: sphinxcontrib-serializinghtml (Sphinx extension)
-sphinxcontrib-serializinghtml:
-sphinxcontrib-serializinghtml: sphinxcontrib-serializinghtml is a sphinx extension which outputs
-sphinxcontrib-serializinghtml: "serialized" HTML files (json and pickle).
-sphinxcontrib-serializinghtml:
-sphinxcontrib-serializinghtml:
-sphinxcontrib-serializinghtml:
-sphinxcontrib-serializinghtml:
-sphinxcontrib-serializinghtml:
-sphinxcontrib-serializinghtml:
-sphinxcontrib-serializinghtml:
diff --git a/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.SlackBuild b/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.SlackBuild
deleted file mode 100644
index ade81993f10..00000000000
--- a/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.SlackBuild
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for sphinxcontrib-serializinghtml
-
-# Copyright 2024  fourtysixandtwo 
-# Copyright 2019-2020 Benjamin Trigona-Harany 
-# 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.
-
-# 20240101 46and2: Updated version, new maintainer.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=sphinxcontrib-serializinghtml
-SRCNAM=sphinxcontrib_serializinghtml
-VERSION=${VERSION:-2.0.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$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 {} \+
-
-python3 -m build --no-isolation
-python3 -m installer -d "$PKG" dist/*.whl
-
-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
-cp -a \
-  CHANGES.rst LICENCE.rst README.rst \
-  $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
diff --git a/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.info b/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.info
deleted file mode 100644
index 6881a4a0c3f..00000000000
--- a/python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="sphinxcontrib-serializinghtml"
-VERSION="2.0.0"
-HOMEPAGE="https://github.com/sphinx-doc/sphinxcontrib-serializinghtml"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/s/sphinxcontrib-serializinghtml/sphinxcontrib_serializinghtml-2.0.0.tar.gz"
-MD5SUM="b536ce248d5ca134a30018692a17c6ca"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="python3-build"
-MAINTAINER="fourtysixandtwo"
-EMAIL="fourtysixandtwo@sliderr.net"
diff --git a/system/audit/audit.SlackBuild b/system/audit/audit.SlackBuild
index baf85c9b38c..45aca7c2a15 100644
--- a/system/audit/audit.SlackBuild
+++ b/system/audit/audit.SlackBuild
@@ -79,6 +79,9 @@ find -L . \
 # Init should check /etc/rc.d/rc.auditd.conf instead of /etc/sysconfig/auditd
 patch -p1 < $CWD/audit-2.3.6-sysconfig.diff
 
+# python binding are disabled ATM, see
+# https://listman.redhat.com/archives/linux-audit/2022-February/msg00085.html
+# thanks to fourtysixandtwo for the pointers
 CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -94,6 +97,8 @@ CFLAGS="$SLKCFLAGS" \
   --enable-systemd=no \
   --with-libcap-ng=yes \
   --enable-gssapi-krb5=yes \
+  --without-python \
+  --without-python3 \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild
index 6dd6914e5a5..87990318236 100644
--- a/system/conky/conky.SlackBuild
+++ b/system/conky/conky.SlackBuild
@@ -104,7 +104,7 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     -DDOC_PATH=/usr/doc/$PRGNAM-$VERSION \
-    -DMAINTAINER_MODE=ON \
+    -DMAINTAINER_MODE=OFF \
     -DBUILD_DOCS=OFF \
     -DBUILD_EXTRAS=ON \
     -DBUILD_XDBE=ON \
diff --git a/system/corectrl/corectrl.SlackBuild b/system/corectrl/corectrl.SlackBuild
index 198120e66e2..e2c2e5fb96e 100644
--- a/system/corectrl/corectrl.SlackBuild
+++ b/system/corectrl/corectrl.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=corectrl
-VERSION=${VERSION:-v1.3.2}
+VERSION=${VERSION:-v1.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
diff --git a/system/corectrl/corectrl.info b/system/corectrl/corectrl.info
index 681b3e7e294..1df92bae08a 100644
--- a/system/corectrl/corectrl.info
+++ b/system/corectrl/corectrl.info
@@ -1,10 +1,10 @@
 PRGNAM="corectrl"
-VERSION="v1.3.2"
+VERSION="v1.4.0"
 HOMEPAGE="https://gitlab.com/corectrl/corectrl/"
-DOWNLOAD="https://gitlab.com/corectrl/corectrl/-/archive/v1.3.2/corectrl-v1.3.2.tar.gz"
-MD5SUM="656d7d307c7f0185794d08239bf00d58"
+DOWNLOAD="https://gitlab.com/corectrl/corectrl/-/archive/v1.4.0/corectrl-v1.4.0.tar.gz"
+MD5SUM="b5f9571d64905a7594c54b9a419fe139"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="Botan"
+REQUIRES="Botan pugixml spdlog"
 MAINTAINER="Matthew Miller"
 EMAIL="mattallmill@gmail.com"
diff --git a/system/detox/detox.SlackBuild b/system/detox/detox.SlackBuild
index f8a3f57be87..117f1c36e25 100644
--- a/system/detox/detox.SlackBuild
+++ b/system/detox/detox.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=detox
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-2.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -103,7 +103,7 @@ 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 CHANGES LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/detox/detox.info b/system/detox/detox.info
index 2451d0f5e2c..14df8cca07f 100644
--- a/system/detox/detox.info
+++ b/system/detox/detox.info
@@ -1,8 +1,8 @@
 PRGNAM="detox"
-VERSION="1.2.0"
+VERSION="2.0.0"
 HOMEPAGE="http://detox.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/detox/detox-1.2.0.tar.bz2"
-MD5SUM="da34c6bc3c68ce2fb008e25066e72927"
+DOWNLOAD="http://downloads.sourceforge.net/detox/detox-2.0.0.tar.bz2"
+MD5SUM="62c07049b66dae30231864d019ebc645"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild b/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild
index 8f179cca539..f161d179414 100644
--- a/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild
+++ b/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild
@@ -82,7 +82,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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-implicit-function-declaration" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
index 99479cf1ecf..5bf6a3f1fb0 100644
--- a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
+++ b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
@@ -112,7 +112,7 @@ if [ x`objdump -f escprlib/lib/libescpr2_32.a |grep ^architecture |cut -d' ' -f-
 fi
 #next line added as slackware autocmake is higher than 1.15 so m4 files need regenerating for v>1.2.12
 autoreconf
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fpermissive" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/system/fakechroot/fakechroot-2.20.1-glibc-2.33.patch b/system/fakechroot/fakechroot-2.20.1-glibc-2.33.patch
deleted file mode 100644
index 31c2dd78439..00000000000
--- a/system/fakechroot/fakechroot-2.20.1-glibc-2.33.patch
+++ /dev/null
@@ -1,469 +0,0 @@
-From 534e6d555736b97211523970d378dfb0db2608e9 Mon Sep 17 00:00:00 2001
-From: Ilya Lipnitskiy 
-Date: Mon, 22 Feb 2021 21:44:07 -0800
-Subject: [PATCH 1/6] tmpnam.c: fix heap overflow
-
-Signed-off-by: Ilya Lipnitskiy 
----
- src/tmpnam.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tmpnam.c b/src/tmpnam.c
-index ce60817..917ee6b 100644
---- a/src/tmpnam.c
-+++ b/src/tmpnam.c
-@@ -42,7 +42,7 @@ wrapper(tmpnam, char *, (char * s))
- 
-     expand_chroot_path(ptr);
- 
--    ptr2 = malloc(strlen(ptr));
-+    ptr2 = malloc(strlen(ptr) + 1);
-     if (ptr2 == NULL) return NULL;
- 
-     strcpy(ptr2, ptr);
-
-From 75d7e6fa191c11a791faff06a0de86eaa7801d05 Mon Sep 17 00:00:00 2001
-From: Ilya Lipnitskiy 
-Date: Mon, 22 Feb 2021 21:46:36 -0800
-Subject: [PATCH 2/6] declare missing bufs, remove ver from lstat
-
-Signed-off-by: Ilya Lipnitskiy 
----
- src/lstat.c  | 8 +++++---
- src/lstat.h  | 2 +-
- src/mknod.c  | 2 ++
- src/stat.c   | 2 ++
- src/stat64.c | 2 ++
- 5 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/src/lstat.c b/src/lstat.c
-index 3f6d819..54e3263 100644
---- a/src/lstat.c
-+++ b/src/lstat.c
-@@ -28,9 +28,11 @@
- #include "lstat.h"
- 
- 
--wrapper(lstat, int, (int ver, const char * filename, struct stat * buf))
-+wrapper(lstat, int, (const char * filename, struct stat * buf))
- {
--    debug("lstat(%d, \"%s\", &buf)", ver, filename);
-+    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
-+    char fakechroot_buf[FAKECHROOT_PATH_MAX];
-+    debug("lstat(\"%s\", &buf)", filename);
- 
-     if (!fakechroot_localdir(filename)) {
-         if (filename != NULL) {
-@@ -40,7 +42,7 @@ wrapper(lstat, int, (int ver, const char * filename, struct stat * buf))
-         }
-     }
- 
--    return lstat_rel(ver, filename, buf);
-+    return lstat_rel(filename, buf);
- }
- 
- 
-diff --git a/src/lstat.h b/src/lstat.h
-index 751c1ea..ee48303 100644
---- a/src/lstat.h
-+++ b/src/lstat.h
-@@ -26,7 +26,7 @@
- 
- #ifndef HAVE___LXSTAT
- 
--wrapper_proto(lstat, int, (int, const char *, struct stat *));
-+wrapper_proto(lstat, int, (const char *, struct stat *));
- 
- int lstat_rel(const char *, struct stat *);
- 
-diff --git a/src/mknod.c b/src/mknod.c
-index 52fd33b..2771037 100644
---- a/src/mknod.c
-+++ b/src/mknod.c
-@@ -28,6 +28,8 @@
- 
- wrapper(mknod, int, (const char * pathname, mode_t mode, dev_t dev))
- {
-+    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
-+    char fakechroot_buf[FAKECHROOT_PATH_MAX];
-     debug("mknod(\"%s\", 0%o, %ld)", pathname, mode, dev);
-     expand_chroot_path(pathname);
-     return nextcall(mknod)(pathname, mode, dev);
-diff --git a/src/stat.c b/src/stat.c
-index 7845662..7b37793 100644
---- a/src/stat.c
-+++ b/src/stat.c
-@@ -33,6 +33,8 @@
- 
- wrapper(stat, int, (const char * file_name, struct stat * buf))
- {
-+    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
-+    char fakechroot_buf[FAKECHROOT_PATH_MAX];
-     debug("stat(\"%s\", &buf)", file_name);
-     expand_chroot_path(file_name);
-     return nextcall(stat)(file_name, buf);
-diff --git a/src/stat64.c b/src/stat64.c
-index aac9c75..a360f66 100644
---- a/src/stat64.c
-+++ b/src/stat64.c
-@@ -34,6 +34,8 @@
- 
- wrapper(stat64, int, (const char * file_name, struct stat64 * buf))
- {
-+    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
-+    char fakechroot_buf[FAKECHROOT_PATH_MAX];
-     debug("stat64(\"%s\", &buf)", file_name);
-     expand_chroot_path(file_name);
-     return nextcall(stat64)(file_name, buf);
-
-From 693a3597ea7fccfb62f357503ff177bd3e3d5a89 Mon Sep 17 00:00:00 2001
-From: Ilya Lipnitskiy 
-Date: Mon, 22 Feb 2021 21:47:09 -0800
-Subject: [PATCH 3/6] fix glibc 2.33+ compatibility
-
-Signed-off-by: Ilya Lipnitskiy 
----
- configure.ac        | 20 ++++++++++++++++++++
- src/ftw.c           |  2 +-
- src/ftw64.c         | 14 +++++++++++---
- src/libfakechroot.h | 15 +++++++++++++++
- src/lstat.c         |  2 +-
- src/lstat.h         |  2 +-
- src/lstat64.c       |  2 +-
- src/mknod.c         |  2 +-
- src/mknodat.c       |  2 +-
- src/stat.c          |  2 +-
- src/stat64.c        |  2 +-
- 11 files changed, 54 insertions(+), 11 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8cdb32..9cc2e77 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -75,6 +75,26 @@ ACX_CHECK_C_ATTRIBUTE_VISIBILITY
- # Checks for libraries.
- AC_CHECK_LIB([dl], [dlsym])
- 
-+AH_TEMPLATE([NEW_GLIBC], [glibc >= 2.33])
-+AC_MSG_CHECKING([for glibc 2.33+])
-+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+       #include 
-+  ]], [[
-+#ifdef __GLIBC__
-+#if !__GLIBC_PREREQ(2,33)
-+#error glibc<2.33
-+#endif
-+#else
-+#error not glibc
-+#endif
-+  ]])],[
-+   AC_DEFINE(NEW_GLIBC,1)
-+   AC_MSG_RESULT([yes])
-+  ],[
-+   AC_DEFINE(NEW_GLIBC,0)
-+   AC_MSG_RESULT([no])
-+  ])
-+
- # Checks for header files.
- AC_HEADER_DIRENT
- AC_HEADER_STDC
-diff --git a/src/ftw.c b/src/ftw.c
-index 92fc126..a9abc85 100644
---- a/src/ftw.c
-+++ b/src/ftw.c
-@@ -185,7 +185,7 @@ int rpl_lstat (const char *, struct stat *);
- # define NFTW_NEW_NAME __new_nftw
- # define INO_T ino_t
- # define STAT stat
--# ifdef _LIBC
-+# if defined(_LIBC) && !NEW_GLIBC
- #  define LXSTAT __lxstat
- #  define XSTAT __xstat
- #  define FXSTATAT __fxstatat
-diff --git a/src/ftw64.c b/src/ftw64.c
-index 7cc8cdf..cee1f2b 100644
---- a/src/ftw64.c
-+++ b/src/ftw64.c
-@@ -18,6 +18,8 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#include "config.h"
-+
- #define __FTW64_C
- #define FTW_NAME ftw64
- #define NFTW_NAME nftw64
-@@ -25,9 +27,15 @@
- #define NFTW_NEW_NAME __new_nftw64
- #define INO_T ino64_t
- #define STAT stat64
--#define LXSTAT __lxstat64
--#define XSTAT __xstat64
--#define FXSTATAT __fxstatat64
-+#if NEW_GLIBC
-+#  define LXSTAT(V,f,sb) lstat64 (f,sb)
-+#  define XSTAT(V,f,sb) stat64 (f,sb)
-+#  define FXSTATAT(V,d,f,sb,m) fstatat64 (d, f, sb, m)
-+#else
-+#  define LXSTAT __lxstat64
-+#  define XSTAT __xstat64
-+#  define FXSTATAT __fxstatat64
-+#endif
- #define FTW_FUNC_T __ftw64_func_t
- #define NFTW_FUNC_T __nftw64_func_t
- 
-diff --git a/src/libfakechroot.h b/src/libfakechroot.h
-index 4cf199f..64ff15f 100644
---- a/src/libfakechroot.h
-+++ b/src/libfakechroot.h
-@@ -200,6 +200,21 @@
- # endif
- #endif
- 
-+#ifndef _STAT_VER
-+ #if defined (__aarch64__)
-+  #define _STAT_VER 0
-+ #elif defined (__powerpc__) && __WORDSIZE == 64
-+  #define _STAT_VER 1
-+ #elif defined (__riscv) && __riscv_xlen==64
-+  #define _STAT_VER 0
-+ #elif defined (__s390x__)
-+  #define _STAT_VER 1
-+ #elif defined (__x86_64__)
-+  #define _STAT_VER 1
-+ #else
-+  #define _STAT_VER 3
-+ #endif
-+#endif
- 
- typedef void (*fakechroot_wrapperfn_t)(void);
- 
-diff --git a/src/lstat.c b/src/lstat.c
-index 54e3263..fa38323 100644
---- a/src/lstat.c
-+++ b/src/lstat.c
-@@ -20,7 +20,7 @@
- 
- #include 
- 
--#ifndef HAVE___LXSTAT
-+#if !defined(HAVE___LXSTAT) || NEW_GLIBC
- 
- #include 
- #include 
-diff --git a/src/lstat.h b/src/lstat.h
-index ee48303..c46a2b9 100644
---- a/src/lstat.h
-+++ b/src/lstat.h
-@@ -24,7 +24,7 @@
- #include 
- #include "libfakechroot.h"
- 
--#ifndef HAVE___LXSTAT
-+#if !defined(HAVE___LXSTAT) || NEW_GLIBC
- 
- wrapper_proto(lstat, int, (const char *, struct stat *));
- 
-diff --git a/src/lstat64.c b/src/lstat64.c
-index b6212fc..a332d7c 100644
---- a/src/lstat64.c
-+++ b/src/lstat64.c
-@@ -20,7 +20,7 @@
- 
- #include 
- 
--#if defined(HAVE_LSTAT64) && !defined(HAVE___LXSTAT64)
-+#if defined(HAVE_LSTAT64) && (!defined(HAVE___LXSTAT64) || NEW_GLIBC)
- 
- #define _LARGEFILE64_SOURCE
- #define _BSD_SOURCE
-diff --git a/src/mknod.c b/src/mknod.c
-index 2771037..aeb750b 100644
---- a/src/mknod.c
-+++ b/src/mknod.c
-@@ -20,7 +20,7 @@
- 
- #include 
- 
--#ifndef HAVE___XMKNOD
-+#if !defined(HAVE___XMKNOD) || NEW_GLIBC
- 
- #include 
- #include "libfakechroot.h"
-diff --git a/src/mknodat.c b/src/mknodat.c
-index 732a22b..3239b35 100644
---- a/src/mknodat.c
-+++ b/src/mknodat.c
-@@ -20,7 +20,7 @@
- 
- #include 
- 
--#if defined(HAVE_MKNODAT) && !defined(HAVE___XMKNODAT)
-+#if defined(HAVE_MKNODAT) && (!defined(HAVE___XMKNODAT) || NEW_GLIBC)
- 
- #define _ATFILE_SOURCE
- #include 
-diff --git a/src/stat.c b/src/stat.c
-index 7b37793..5ef57ba 100644
---- a/src/stat.c
-+++ b/src/stat.c
-@@ -20,7 +20,7 @@
- 
- #include 
- 
--#ifndef HAVE___XSTAT
-+#if !defined(HAVE___XSTAT) || NEW_GLIBC
- 
- #define _BSD_SOURCE
- #define _DEFAULT_SOURCE
-diff --git a/src/stat64.c b/src/stat64.c
-index a360f66..993ce80 100644
---- a/src/stat64.c
-+++ b/src/stat64.c
-@@ -20,7 +20,7 @@
- 
- #include 
- 
--#if defined(HAVE_STAT64) && !defined(HAVE___XSTAT64)
-+#if defined(HAVE_STAT64) && (!defined(HAVE___XSTAT64) || NEW_GLIBC)
- 
- #define _BSD_SOURCE
- #define _LARGEFILE64_SOURCE
-
-From e7c1f3a446e594a4d0cce5f5d499c9439ce1d5c5 Mon Sep 17 00:00:00 2001
-From: neok-m4700 
-Date: Wed, 24 Feb 2021 17:36:57 +0100
-Subject: [PATCH 6/6] wrap fstatat and fstatat64
-
----
- configure.ac    |  2 ++
- src/Makefile.am |  2 ++
- src/fstatat.c   | 42 ++++++++++++++++++++++++++++++++++++++++++
- src/fstatat64.c | 43 +++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 89 insertions(+)
- create mode 100644 src/fstatat.c
- create mode 100644 src/fstatat64.c
-
-diff --git a/configure.ac b/configure.ac
-index 9cc2e77..5b3053e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -218,6 +218,8 @@ AC_CHECK_FUNCS(m4_normalize([
-     freopen64
-     fstat
-     fstat64
-+    fstatat
-+    fstatat64
-     fts_children
-     fts_open
-     fts_read
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6066345..eb311c0 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -61,6 +61,8 @@ libfakechroot_la_SOURCES = \
-     fopen64.c \
-     freopen.c \
-     freopen64.c \
-+    fstatat.c \
-+    fstatat64.c \
-     fts.c \
-     fts64.c \
-     ftw.c \
-diff --git a/src/fstatat.c b/src/fstatat.c
-new file mode 100644
-index 0000000..ca7578b
---- /dev/null
-+++ b/src/fstatat.c
-@@ -0,0 +1,42 @@
-+/*
-+    libfakechroot -- fake chroot environment
-+    Copyright (c) 2010, 2021 Piotr Roszatycki 
-+
-+    This library is free software; you can redistribute it and/or
-+    modify it under the terms of the GNU Lesser General Public
-+    License as published by the Free Software Foundation; either
-+    version 2.1 of the License, or (at your option) any later version.
-+
-+    This library is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+    Lesser General Public License for more details.
-+
-+    You should have received a copy of the GNU Lesser General Public
-+    License along with this library; if not, write to the Free Software
-+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-+*/
-+
-+
-+#include 
-+
-+#ifdef HAVE_FSTATAT
-+
-+#define _ATFILE_SOURCE
-+#define _POSIX_C_SOURCE 200809L
-+#include 
-+#include 
-+#include "libfakechroot.h"
-+
-+wrapper(fstatat, int, (int dirfd, const char *pathname, struct stat *buf, int flags))
-+{
-+    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
-+    char fakechroot_buf[FAKECHROOT_PATH_MAX];
-+    debug("fstatat(%d, \"%s\", &buf, %d)", dirfd, pathname, flags);
-+    expand_chroot_path_at(dirfd, pathname);
-+    return nextcall(fstatat)(dirfd, pathname, buf, flags);
-+}
-+
-+#else
-+typedef int empty_translation_unit;
-+#endif
-diff --git a/src/fstatat64.c b/src/fstatat64.c
-new file mode 100644
-index 0000000..1863372
---- /dev/null
-+++ b/src/fstatat64.c
-@@ -0,0 +1,43 @@
-+/*
-+    libfakechroot -- fake chroot environment
-+    Copyright (c) 2010, 2021 Piotr Roszatycki 
-+
-+    This library is free software; you can redistribute it and/or
-+    modify it under the terms of the GNU Lesser General Public
-+    License as published by the Free Software Foundation; either
-+    version 2.1 of the License, or (at your option) any later version.
-+
-+    This library is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+    Lesser General Public License for more details.
-+
-+    You should have received a copy of the GNU Lesser General Public
-+    License along with this library; if not, write to the Free Software
-+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-+*/
-+
-+
-+#include 
-+
-+#ifdef HAVE_FSTATAT64
-+
-+#define _ATFILE_SOURCE
-+#define _POSIX_C_SOURCE 200809L
-+#define _LARGEFILE64_SOURCE
-+#include 
-+#include 
-+#include "libfakechroot.h"
-+
-+wrapper(fstatat64, int, (int dirfd, const char *pathname, struct stat64 *buf, int flags))
-+{
-+    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
-+    char fakechroot_buf[FAKECHROOT_PATH_MAX];
-+    debug("fstatat64(%d, \"%s\", &buf, %d)", dirfd, pathname, flags);
-+    expand_chroot_path_at(dirfd, pathname);
-+    return nextcall(fstatat64)(dirfd, pathname, buf, flags);
-+}
-+
-+#else
-+typedef int empty_translation_unit;
-+#endif
diff --git a/system/fakechroot/fakechroot.SlackBuild b/system/fakechroot/fakechroot.SlackBuild
index ae5854880af..db97a1ba6c9 100644
--- a/system/fakechroot/fakechroot.SlackBuild
+++ b/system/fakechroot/fakechroot.SlackBuild
@@ -72,8 +72,6 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-# thanks gentoo maintainers
-patch -p1 < $CWD/fakechroot-2.20.1-glibc-2.33.patch
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -81,6 +79,10 @@ 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 {} \;
 
+# get patches from fedora (thanks!)
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
+autoreconf -vif
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/system/fakechroot/patches/104.patch b/system/fakechroot/patches/104.patch
new file mode 100644
index 00000000000..0e7d7f0b52c
--- /dev/null
+++ b/system/fakechroot/patches/104.patch
@@ -0,0 +1,1727 @@
+From 11589e1037372c5ad719e1e46d7462fd196caa56 Mon Sep 17 00:00:00 2001
+From: Johannes Schauer Marin Rodrigues 
+Date: Thu, 24 Jun 2021 10:38:28 +0200
+Subject: [PATCH 01/11] src/lckpwdf.c: create an empty /etc/.pwd.lock
+
+---
+ src/lckpwdf.c | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+diff --git a/src/lckpwdf.c b/src/lckpwdf.c
+index dc0e68b5..66a058de 100644
+--- a/src/lckpwdf.c
++++ b/src/lckpwdf.c
+@@ -22,12 +22,37 @@
+ 
+ #ifdef HAVE_LCKPWDF
+ 
++#include 
++#include 
+ #include "libfakechroot.h"
++#include "open.h"
+ 
+ 
+ wrapper(lckpwdf, int, (void))
+ {
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
++
++    int file;
+     debug("lckpwdf()");
++    // lckpwdf will create an empty /etc/.pwd.lock
++    // if that file doesn't exist yet, we create it here as well
++    char* pwdlockfile = "/etc/.pwd.lock";
++    expand_chroot_path(pwdlockfile);
++
++    if ((file = nextcall(open)(pwdlockfile, O_RDONLY)) == 0) {
++        // if the file already exists, don't touch it
++        close(file);
++        return 0;
++    }
++
++    if ((file = nextcall(open)(pwdlockfile, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR)) == -1) {
++        // we ignore any errors (maybe /etc doesn't exist or we don't have the
++        // necessary permissions)
++        return 0;
++    }
++    // the file remains empty
++    close(file);
+     return 0;
+ }
+ 
+
+From 3cdb9b5426ef508c9220b4b0316954e3b7dff9ac Mon Sep 17 00:00:00 2001
+From: Hajime Yoshimori 
+Date: Fri, 1 May 2020 21:14:32 +0900
+Subject: [PATCH 02/11] check return value of dladdr
+
+https://github.com/dex4er/fakechroot/pull/70
+---
+ src/dladdr.c           | 12 +++++++-----
+ test/Makefile.am       |  1 +
+ test/src/Makefile.am   |  1 +
+ test/src/test-dladdr.c | 14 ++++++++++++++
+ test/t/dladdr.t        | 14 ++++++++++++++
+ 5 files changed, 37 insertions(+), 5 deletions(-)
+ create mode 100644 test/src/test-dladdr.c
+ create mode 100755 test/t/dladdr.t
+
+diff --git a/src/dladdr.c b/src/dladdr.c
+index fef32579..3dffdb3f 100644
+--- a/src/dladdr.c
++++ b/src/dladdr.c
+@@ -36,11 +36,13 @@ wrapper(dladdr, int, (const void * addr, Dl_info * info))
+ 
+     ret = nextcall(dladdr)(addr, info);
+ 
+-    if (info->dli_fname) {
+-        narrow_chroot_path(info->dli_fname);
+-    }
+-    if (info->dli_sname) {
+-        narrow_chroot_path(info->dli_sname);
++    if (ret != 0) {
++        if (info->dli_fname) {
++            narrow_chroot_path(info->dli_fname);
++        }
++        if (info->dli_sname) {
++            narrow_chroot_path(info->dli_sname);
++        }
+     }
+ 
+     return ret;
+diff --git a/test/Makefile.am b/test/Makefile.am
+index aba29538..0021b0a1 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -9,6 +9,7 @@ TESTS = \
+     t/cmd-subst.t \
+     t/cp.t \
+     t/dedotdot.t \
++    t/dladdr.t \
+     t/execlp.t \
+     t/execve-elfloader.t \
+     t/execve-null-envp.t \
+diff --git a/test/src/Makefile.am b/test/src/Makefile.am
+index 7fb3075b..5f5fde8d 100644
+--- a/test/src/Makefile.am
++++ b/test/src/Makefile.am
+@@ -3,6 +3,7 @@ check_PROGRAMS = \
+     test-chroot \
+     test-clearenv \
+     test-dedotdot \
++    test-dladdr \
+     test-execlp \
+     test-execve-null-envp \
+     test-fts \
+diff --git a/test/src/test-dladdr.c b/test/src/test-dladdr.c
+new file mode 100644
+index 00000000..5ec8d248
+--- /dev/null
++++ b/test/src/test-dladdr.c
+@@ -0,0 +1,14 @@
++#define _GNU_SOURCE
++#include 
++#include 
++#include 
++#include 
++
++int main(int argc, char** argv)
++{
++  Dl_info info;
++  memset(&info, 0xfe, sizeof(info)); /* fill with inaccessible address */
++  int ret = dladdr(NULL, &info);
++  printf("%ld\n", ret);
++  return 0;
++}
+diff --git a/test/t/dladdr.t b/test/t/dladdr.t
+new file mode 100755
+index 00000000..fc7f9397
+--- /dev/null
++++ b/test/t/dladdr.t
+@@ -0,0 +1,14 @@
++#!/bin/sh
++
++srcdir=${srcdir:-.}
++. $srcdir/common.inc.sh
++
++prepare 1
++
++PATH=$srcdir/bin:$PATH
++
++t=`$srcdir/fakechroot.sh $testtree /bin/test-dladdr`
++[ "$t" != "0" ] && not
++ok "dladdr returns" $t
++
++cleanup
+
+From 63c2cbed6dca6196940b439736ca2c069cb9358b Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy 
+Date: Mon, 22 Feb 2021 21:44:07 -0800
+Subject: [PATCH 03/11] tmpnam.c: fix heap overflow
+
+https://github.com/dex4er/fakechroot/pull/85
+
+Signed-off-by: Ilya Lipnitskiy 
+---
+ src/tmpnam.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tmpnam.c b/src/tmpnam.c
+index ce60817a..917ee6b7 100644
+--- a/src/tmpnam.c
++++ b/src/tmpnam.c
+@@ -42,7 +42,7 @@ wrapper(tmpnam, char *, (char * s))
+ 
+     expand_chroot_path(ptr);
+ 
+-    ptr2 = malloc(strlen(ptr));
++    ptr2 = malloc(strlen(ptr) + 1);
+     if (ptr2 == NULL) return NULL;
+ 
+     strcpy(ptr2, ptr);
+
+From be3a291ef37ace606ec2845f6c1b645b981805cb Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy 
+Date: Mon, 22 Feb 2021 21:46:36 -0800
+Subject: [PATCH 04/11] declare missing bufs, remove ver from lstat
+
+https://github.com/dex4er/fakechroot/pull/85
+
+Signed-off-by: Ilya Lipnitskiy 
+---
+ src/lstat.c  | 8 +++++---
+ src/lstat.h  | 2 +-
+ src/mknod.c  | 2 ++
+ src/stat.c   | 2 ++
+ src/stat64.c | 2 ++
+ 5 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/src/lstat.c b/src/lstat.c
+index 3f6d819f..54e3263f 100644
+--- a/src/lstat.c
++++ b/src/lstat.c
+@@ -28,9 +28,11 @@
+ #include "lstat.h"
+ 
+ 
+-wrapper(lstat, int, (int ver, const char * filename, struct stat * buf))
++wrapper(lstat, int, (const char * filename, struct stat * buf))
+ {
+-    debug("lstat(%d, \"%s\", &buf)", ver, filename);
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
++    debug("lstat(\"%s\", &buf)", filename);
+ 
+     if (!fakechroot_localdir(filename)) {
+         if (filename != NULL) {
+@@ -40,7 +42,7 @@ wrapper(lstat, int, (int ver, const char * filename, struct stat * buf))
+         }
+     }
+ 
+-    return lstat_rel(ver, filename, buf);
++    return lstat_rel(filename, buf);
+ }
+ 
+ 
+diff --git a/src/lstat.h b/src/lstat.h
+index 751c1ead..ee483033 100644
+--- a/src/lstat.h
++++ b/src/lstat.h
+@@ -26,7 +26,7 @@
+ 
+ #ifndef HAVE___LXSTAT
+ 
+-wrapper_proto(lstat, int, (int, const char *, struct stat *));
++wrapper_proto(lstat, int, (const char *, struct stat *));
+ 
+ int lstat_rel(const char *, struct stat *);
+ 
+diff --git a/src/mknod.c b/src/mknod.c
+index 52fd33b2..27710372 100644
+--- a/src/mknod.c
++++ b/src/mknod.c
+@@ -28,6 +28,8 @@
+ 
+ wrapper(mknod, int, (const char * pathname, mode_t mode, dev_t dev))
+ {
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
+     debug("mknod(\"%s\", 0%o, %ld)", pathname, mode, dev);
+     expand_chroot_path(pathname);
+     return nextcall(mknod)(pathname, mode, dev);
+diff --git a/src/stat.c b/src/stat.c
+index 78456620..7b377933 100644
+--- a/src/stat.c
++++ b/src/stat.c
+@@ -33,6 +33,8 @@
+ 
+ wrapper(stat, int, (const char * file_name, struct stat * buf))
+ {
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
+     debug("stat(\"%s\", &buf)", file_name);
+     expand_chroot_path(file_name);
+     return nextcall(stat)(file_name, buf);
+diff --git a/src/stat64.c b/src/stat64.c
+index aac9c75f..a360f66f 100644
+--- a/src/stat64.c
++++ b/src/stat64.c
+@@ -34,6 +34,8 @@
+ 
+ wrapper(stat64, int, (const char * file_name, struct stat64 * buf))
+ {
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
+     debug("stat64(\"%s\", &buf)", file_name);
+     expand_chroot_path(file_name);
+     return nextcall(stat64)(file_name, buf);
+
+From 26f69c2c3120b9b059209c7566850ef5187de56a Mon Sep 17 00:00:00 2001
+From: Ilya Lipnitskiy 
+Date: Mon, 22 Feb 2021 21:47:09 -0800
+Subject: [PATCH 05/11] fix glibc 2.33+ compatibility
+
+https://github.com/dex4er/fakechroot/pull/85
+
+Signed-off-by: Ilya Lipnitskiy 
+---
+ configure.ac        | 20 ++++++++++++++++++++
+ src/ftw.c           |  2 +-
+ src/ftw64.c         | 14 +++++++++++---
+ src/libfakechroot.h | 15 +++++++++++++++
+ src/lstat.c         |  2 +-
+ src/lstat.h         |  2 +-
+ src/lstat64.c       |  2 +-
+ src/mknod.c         |  2 +-
+ src/mknodat.c       |  2 +-
+ src/stat.c          |  2 +-
+ src/stat64.c        |  2 +-
+ 11 files changed, 54 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f8cdb323..9cc2e779 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -75,6 +75,26 @@ ACX_CHECK_C_ATTRIBUTE_VISIBILITY
+ # Checks for libraries.
+ AC_CHECK_LIB([dl], [dlsym])
+ 
++AH_TEMPLATE([NEW_GLIBC], [glibc >= 2.33])
++AC_MSG_CHECKING([for glibc 2.33+])
++  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++       #include 
++  ]], [[
++#ifdef __GLIBC__
++#if !__GLIBC_PREREQ(2,33)
++#error glibc<2.33
++#endif
++#else
++#error not glibc
++#endif
++  ]])],[
++   AC_DEFINE(NEW_GLIBC,1)
++   AC_MSG_RESULT([yes])
++  ],[
++   AC_DEFINE(NEW_GLIBC,0)
++   AC_MSG_RESULT([no])
++  ])
++
+ # Checks for header files.
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+diff --git a/src/ftw.c b/src/ftw.c
+index 92fc126c..a9abc853 100644
+--- a/src/ftw.c
++++ b/src/ftw.c
+@@ -185,7 +185,7 @@ int rpl_lstat (const char *, struct stat *);
+ # define NFTW_NEW_NAME __new_nftw
+ # define INO_T ino_t
+ # define STAT stat
+-# ifdef _LIBC
++# if defined(_LIBC) && !NEW_GLIBC
+ #  define LXSTAT __lxstat
+ #  define XSTAT __xstat
+ #  define FXSTATAT __fxstatat
+diff --git a/src/ftw64.c b/src/ftw64.c
+index 7cc8cdfd..cee1f2bc 100644
+--- a/src/ftw64.c
++++ b/src/ftw64.c
+@@ -18,6 +18,8 @@
+    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+    02111-1307 USA.  */
+ 
++#include "config.h"
++
+ #define __FTW64_C
+ #define FTW_NAME ftw64
+ #define NFTW_NAME nftw64
+@@ -25,9 +27,15 @@
+ #define NFTW_NEW_NAME __new_nftw64
+ #define INO_T ino64_t
+ #define STAT stat64
+-#define LXSTAT __lxstat64
+-#define XSTAT __xstat64
+-#define FXSTATAT __fxstatat64
++#if NEW_GLIBC
++#  define LXSTAT(V,f,sb) lstat64 (f,sb)
++#  define XSTAT(V,f,sb) stat64 (f,sb)
++#  define FXSTATAT(V,d,f,sb,m) fstatat64 (d, f, sb, m)
++#else
++#  define LXSTAT __lxstat64
++#  define XSTAT __xstat64
++#  define FXSTATAT __fxstatat64
++#endif
+ #define FTW_FUNC_T __ftw64_func_t
+ #define NFTW_FUNC_T __nftw64_func_t
+ 
+diff --git a/src/libfakechroot.h b/src/libfakechroot.h
+index 4cf199ff..64ff15fb 100644
+--- a/src/libfakechroot.h
++++ b/src/libfakechroot.h
+@@ -200,6 +200,21 @@
+ # endif
+ #endif
+ 
++#ifndef _STAT_VER
++ #if defined (__aarch64__)
++  #define _STAT_VER 0
++ #elif defined (__powerpc__) && __WORDSIZE == 64
++  #define _STAT_VER 1
++ #elif defined (__riscv) && __riscv_xlen==64
++  #define _STAT_VER 0
++ #elif defined (__s390x__)
++  #define _STAT_VER 1
++ #elif defined (__x86_64__)
++  #define _STAT_VER 1
++ #else
++  #define _STAT_VER 3
++ #endif
++#endif
+ 
+ typedef void (*fakechroot_wrapperfn_t)(void);
+ 
+diff --git a/src/lstat.c b/src/lstat.c
+index 54e3263f..fa383234 100644
+--- a/src/lstat.c
++++ b/src/lstat.c
+@@ -20,7 +20,7 @@
+ 
+ #include 
+ 
+-#ifndef HAVE___LXSTAT
++#if !defined(HAVE___LXSTAT) || NEW_GLIBC
+ 
+ #include 
+ #include 
+diff --git a/src/lstat.h b/src/lstat.h
+index ee483033..c46a2b9b 100644
+--- a/src/lstat.h
++++ b/src/lstat.h
+@@ -24,7 +24,7 @@
+ #include 
+ #include "libfakechroot.h"
+ 
+-#ifndef HAVE___LXSTAT
++#if !defined(HAVE___LXSTAT) || NEW_GLIBC
+ 
+ wrapper_proto(lstat, int, (const char *, struct stat *));
+ 
+diff --git a/src/lstat64.c b/src/lstat64.c
+index b6212fc8..a332d7c3 100644
+--- a/src/lstat64.c
++++ b/src/lstat64.c
+@@ -20,7 +20,7 @@
+ 
+ #include 
+ 
+-#if defined(HAVE_LSTAT64) && !defined(HAVE___LXSTAT64)
++#if defined(HAVE_LSTAT64) && (!defined(HAVE___LXSTAT64) || NEW_GLIBC)
+ 
+ #define _LARGEFILE64_SOURCE
+ #define _BSD_SOURCE
+diff --git a/src/mknod.c b/src/mknod.c
+index 27710372..aeb750b0 100644
+--- a/src/mknod.c
++++ b/src/mknod.c
+@@ -20,7 +20,7 @@
+ 
+ #include 
+ 
+-#ifndef HAVE___XMKNOD
++#if !defined(HAVE___XMKNOD) || NEW_GLIBC
+ 
+ #include 
+ #include "libfakechroot.h"
+diff --git a/src/mknodat.c b/src/mknodat.c
+index 732a22bc..3239b357 100644
+--- a/src/mknodat.c
++++ b/src/mknodat.c
+@@ -20,7 +20,7 @@
+ 
+ #include 
+ 
+-#if defined(HAVE_MKNODAT) && !defined(HAVE___XMKNODAT)
++#if defined(HAVE_MKNODAT) && (!defined(HAVE___XMKNODAT) || NEW_GLIBC)
+ 
+ #define _ATFILE_SOURCE
+ #include 
+diff --git a/src/stat.c b/src/stat.c
+index 7b377933..5ef57bab 100644
+--- a/src/stat.c
++++ b/src/stat.c
+@@ -20,7 +20,7 @@
+ 
+ #include 
+ 
+-#ifndef HAVE___XSTAT
++#if !defined(HAVE___XSTAT) || NEW_GLIBC
+ 
+ #define _BSD_SOURCE
+ #define _DEFAULT_SOURCE
+diff --git a/src/stat64.c b/src/stat64.c
+index a360f66f..993ce808 100644
+--- a/src/stat64.c
++++ b/src/stat64.c
+@@ -20,7 +20,7 @@
+ 
+ #include 
+ 
+-#if defined(HAVE_STAT64) && !defined(HAVE___XSTAT64)
++#if defined(HAVE_STAT64) && (!defined(HAVE___XSTAT64) || NEW_GLIBC)
+ 
+ #define _BSD_SOURCE
+ #define _LARGEFILE64_SOURCE
+
+From 5366e9a366b213b879abf0f0a3aeb3409d3b57ed Mon Sep 17 00:00:00 2001
+From: neok-m4700 
+Date: Wed, 24 Feb 2021 17:36:57 +0100
+Subject: [PATCH 06/11] wrap fstatat and fstatat64
+
+https://github.com/dex4er/fakechroot/pull/86
+---
+ configure.ac    |  2 ++
+ src/Makefile.am |  2 ++
+ src/fstatat.c   | 42 ++++++++++++++++++++++++++++++++++++++++++
+ src/fstatat64.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 89 insertions(+)
+ create mode 100644 src/fstatat.c
+ create mode 100644 src/fstatat64.c
+
+diff --git a/configure.ac b/configure.ac
+index 9cc2e779..5b3053e1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -218,6 +218,8 @@ AC_CHECK_FUNCS(m4_normalize([
+     freopen64
+     fstat
+     fstat64
++    fstatat
++    fstatat64
+     fts_children
+     fts_open
+     fts_read
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 60663452..eb311c0a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -61,6 +61,8 @@ libfakechroot_la_SOURCES = \
+     fopen64.c \
+     freopen.c \
+     freopen64.c \
++    fstatat.c \
++    fstatat64.c \
+     fts.c \
+     fts64.c \
+     ftw.c \
+diff --git a/src/fstatat.c b/src/fstatat.c
+new file mode 100644
+index 00000000..ca7578b3
+--- /dev/null
++++ b/src/fstatat.c
+@@ -0,0 +1,42 @@
++/*
++    libfakechroot -- fake chroot environment
++    Copyright (c) 2010, 2021 Piotr Roszatycki 
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++*/
++
++
++#include 
++
++#ifdef HAVE_FSTATAT
++
++#define _ATFILE_SOURCE
++#define _POSIX_C_SOURCE 200809L
++#include 
++#include 
++#include "libfakechroot.h"
++
++wrapper(fstatat, int, (int dirfd, const char *pathname, struct stat *buf, int flags))
++{
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
++    debug("fstatat(%d, \"%s\", &buf, %d)", dirfd, pathname, flags);
++    expand_chroot_path_at(dirfd, pathname);
++    return nextcall(fstatat)(dirfd, pathname, buf, flags);
++}
++
++#else
++typedef int empty_translation_unit;
++#endif
+diff --git a/src/fstatat64.c b/src/fstatat64.c
+new file mode 100644
+index 00000000..18633725
+--- /dev/null
++++ b/src/fstatat64.c
+@@ -0,0 +1,43 @@
++/*
++    libfakechroot -- fake chroot environment
++    Copyright (c) 2010, 2021 Piotr Roszatycki 
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++*/
++
++
++#include 
++
++#ifdef HAVE_FSTATAT64
++
++#define _ATFILE_SOURCE
++#define _POSIX_C_SOURCE 200809L
++#define _LARGEFILE64_SOURCE
++#include 
++#include 
++#include "libfakechroot.h"
++
++wrapper(fstatat64, int, (int dirfd, const char *pathname, struct stat64 *buf, int flags))
++{
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
++    debug("fstatat64(%d, \"%s\", &buf, %d)", dirfd, pathname, flags);
++    expand_chroot_path_at(dirfd, pathname);
++    return nextcall(fstatat64)(dirfd, pathname, buf, flags);
++}
++
++#else
++typedef int empty_translation_unit;
++#endif
+
+From bc7ef087c17a475ec03768053fa22c2193ae7fc2 Mon Sep 17 00:00:00 2001
+From: Johannes Schauer Marin Rodrigues 
+Date: Wed, 24 Aug 2022 08:26:04 +0200
+Subject: [PATCH 07/11] Wrap all functions accessing /etc/passwd, /etc/group
+ and /etc/shadow
+
+Starting with glibc 2.32 the compat nss module for getpwnam calls
+__nss_files_fopen (which is a GLIBC_PRIVATE symbol provided by glibc)
+instead of fopen (see 299210c1fa67e2dfb564475986fce11cd33db9ad). This
+leads to getpwnam calls accessing /etc/passwd from *outside* the chroot
+and as a result programs like adduser do not work correctly anymore
+under fakechroot.
+
+Starting with glibc 2.34 the __nss_files_fopen was moved from nss to
+libc.so and thus wrapping it with LD_PRELOAD has no affect anymore
+(see 6212bb67f4695962748a5981e1b9fea105af74f6).
+
+So now we also wrap all the functions accessing /etc/passwd, /etc/group
+and /etc/shadow. This solution will ignore NIS, LDAP or other local files
+as potentially configured in /etc/nsswitch.conf.
+
+https://github.com/dex4er/fakechroot/pull/98
+---
+ src/Makefile.am        |   1 +
+ src/passwd.c           | 296 +++++++++++++++++++++++++++++++++++++++++
+ test/Makefile.am       |   1 +
+ test/src/Makefile.am   |   1 +
+ test/src/test-passwd.c |  28 ++++
+ test/t/passwd.t        |  23 ++++
+ test/testtree.sh       |   6 +
+ 7 files changed, 356 insertions(+)
+ create mode 100644 src/passwd.c
+ create mode 100644 test/src/test-passwd.c
+ create mode 100755 test/t/passwd.t
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index eb311c0a..6e9d9ae1 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -120,6 +120,7 @@ libfakechroot_la_SOURCES = \
+     openat64.c \
+     opendir.c \
+     opendir.h \
++    passwd.c \
+     pathconf.c \
+     popen.c \
+     posix_spawn.c \
+diff --git a/src/passwd.c b/src/passwd.c
+new file mode 100644
+index 00000000..d4cee86c
+--- /dev/null
++++ b/src/passwd.c
+@@ -0,0 +1,296 @@
++/*
++    libfakechroot -- fake chroot environment
++    Copyright (c) 2010, 2013 Piotr Roszatycki 
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++*/
++
++
++#include 
++
++/*
++ * Starting with glibc 2.32 the compat nss module for getpwnam calls
++ * __nss_files_fopen (which is a GLIBC_PRIVATE symbol provided by glibc)
++ * instead of fopen (see 299210c1fa67e2dfb564475986fce11cd33db9ad). This
++ * leads to getpwnam calls accessing /etc/passwd from *outside* the chroot
++ * and as a result programs like adduser do not work correctly anymore
++ * under fakechroot.
++ *
++ * Starting with glibc 2.34 the __nss_files_fopen was moved from nss to
++ * libc.so and thus wrapping it with LD_PRELOAD has no affect anymore
++ * (see 6212bb67f4695962748a5981e1b9fea105af74f6).
++ *
++ * So now we also wrap all the functions accessing /etc/passwd, /etc/group
++ * and /etc/shadow. This solution will ignore NIS, LDAP or other local files
++ * as potentially configured in /etc/nsswitch.conf.
++ */
++
++#include 
++#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 32)
++
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include "libfakechroot.h"
++
++/* getpwent, setpwent, endpwent, getpwuid, getpwnam */
++
++static FILE *pw_f;
++
++wrapper(getpwent, struct passwd *, (void))
++{
++	if (!pw_f) pw_f = fopen("/etc/passwd", "rbe");
++	if (!pw_f) return 0;
++	return fgetpwent(pw_f);
++}
++
++wrapper (getpwent_r, int, (struct passwd *pwbuf, char *buf, size_t buflen, struct passwd **pwbufp))
++{
++	if (!pw_f) pw_f = fopen("/etc/passwd", "rbe");
++	if (!pw_f) return 0;
++	return fgetpwent_r(pw_f, pwbuf, buf, buflen, pwbufp);
++}
++
++wrapper(setpwent, void, (void))
++{
++	if (pw_f) fclose(pw_f);
++	pw_f = 0;
++}
++
++wrapper(endpwent, void, (void))
++{
++	if (pw_f) fclose(pw_f);
++	pw_f = 0;
++}
++
++wrapper(getpwuid, struct passwd *, (uid_t uid))
++{
++	debug("getpwuid(\"%ul\")", uid);
++	FILE *f = fopen("/etc/passwd", "rbe");
++	if (!f) {
++		return NULL;
++	}
++	struct passwd *res = NULL;
++	while ((res = fgetpwent(f))) {
++		if (res->pw_uid == uid)
++			break;
++	}
++	fclose(f);
++	return res;
++}
++
++wrapper(getpwuid_r, int, (uid_t uid, struct passwd *pwd, char *buf, size_t buflen, struct passwd **result))
++{
++	debug("getpwuid_r(\"%ul\")", uid);
++	FILE *f = fopen("/etc/passwd", "rbe");
++	if (!f) {
++		return errno;
++	}
++	int res;
++	while (!(res = fgetpwent_r(f, pwd, buf, buflen, result))) {
++		if (pwd->pw_uid == uid)
++			break;
++	}
++	fclose(f);
++	return res;
++}
++
++wrapper(getpwnam, struct passwd *, (const char *name))
++{
++	debug("getpwnam(\"%s\")", name);
++	FILE *f = fopen("/etc/passwd", "rbe");
++	if (!f) {
++		return NULL;
++	}
++	struct passwd *res = NULL;
++	while ((res = fgetpwent(f))) {
++		if (name && !strcmp(name, res->pw_name))
++			break;
++	}
++	fclose(f);
++	return res;
++}
++
++wrapper(getpwnam_r, int, (const char *name, struct passwd *pwd, char *buf, size_t buflen, struct passwd **result))
++{
++	debug("getpwnam_r(\"%s\")", name);
++	FILE *f = fopen("/etc/passwd", "rbe");
++	if (!f) {
++		return errno;
++	}
++	int res;
++	while (!(res = fgetpwent_r(f, pwd, buf, buflen, result))) {
++		if (name && !strcmp(name, pwd->pw_name))
++			break;
++	}
++	fclose(f);
++	return res;
++}
++
++/* getgrent, setgrent, endgrent, getgrgid, getgrnam */
++
++static FILE *gr_f;
++
++wrapper(getgrent, struct group *, (void))
++{
++	if (!gr_f) gr_f = fopen("/etc/group", "rbe");
++	if (!gr_f) return 0;
++	return fgetgrent(gr_f);
++}
++
++wrapper (getgrent_r, int, (struct group *gbuf, char *buf, size_t buflen, struct group **gbufp))
++{
++	if (!gr_f) gr_f = fopen("/etc/group", "rbe");
++	if (!gr_f) return 0;
++	return fgetgrent_r(gr_f, gbuf, buf, buflen, gbufp);
++}
++
++wrapper(setgrent, void, (void))
++{
++	if (gr_f) fclose(gr_f);
++	gr_f = 0;
++}
++
++wrapper(endgrent, void, (void))
++{
++	if (gr_f) fclose(gr_f);
++	gr_f = 0;
++}
++
++wrapper(getgrgid, struct group *, (gid_t gid))
++{
++	debug("getgrgid(\"%ul\")", gid);
++	FILE *f = fopen("/etc/group", "rbe");
++	if (!f) {
++		return NULL;
++	}
++	struct group *res = NULL;
++	while ((res = fgetgrent(f))) {
++		if (res->gr_gid == gid)
++			break;
++	}
++	fclose(f);
++	return res;
++}
++
++wrapper(getgrgid_r, int, (gid_t gid, struct group *grp, char *buf, size_t buflen, struct group **result))
++{
++	debug("getgrgid_r(\"%ul\")", gid);
++	FILE *f = fopen("/etc/group", "rbe");
++	if (!f) {
++		return errno;
++	}
++	int res;
++	while (!(res = fgetgrent_r(f, grp, buf, buflen, result))) {
++		if (grp->gr_gid == gid)
++			break;
++	}
++	fclose(f);
++	return res;
++}
++
++wrapper(getgrnam, struct group *, (const char *name))
++{
++	debug("getgrnam(\"%s\")", name);
++	FILE *f = fopen("/etc/group", "rbe");
++	if (!f) {
++		return NULL;
++	}
++	struct group *res = NULL;
++	while ((res = fgetgrent(f))) {
++		if (name && !strcmp(name, res->gr_name))
++			break;
++	}
++	fclose(f);
++	return res;
++}
++
++wrapper(getgrnam_r, int, (const char *name, struct group *grp, char *buf, size_t buflen, struct group **result))
++{
++	debug("getgrnam_r(\"%s\")", name);
++	FILE *f = fopen("/etc/group", "rbe");
++	if (!f) {
++		return errno;
++	}
++	int res;
++	while (!(res = fgetgrent_r(f, grp, buf, buflen, result))) {
++		if (name && !strcmp(name, grp->gr_name))
++			break;
++	}
++	fclose(f);
++	return res;
++}
++
++/* getspent, setspent, endspent, getspnam */
++
++static FILE *sp_f;
++
++wrapper(getspent, struct spwd *, (void))
++{
++	if (!sp_f) sp_f = fopen("/etc/shadow", "rbe");
++	if (!sp_f) return 0;
++	return fgetspent(sp_f);
++}
++
++wrapper(setspent, void, (void))
++{
++	if (sp_f) fclose(sp_f);
++	sp_f = 0;
++}
++
++wrapper(endspent, void, (void))
++{
++	if (sp_f) fclose(sp_f);
++	sp_f = 0;
++}
++
++wrapper(getspnam, struct spwd *, (const char *name))
++{
++	debug("getspnam(\"%s\")", name);
++	FILE *f = fopen("/etc/shadow", "rbe");
++	if (!f) {
++		return NULL;
++	}
++	struct spwd *res = NULL;
++	while ((res = fgetspent(f))) {
++		if (name && !strcmp(name, res->sp_namp))
++			break;
++	}
++	fclose(f);
++	return res;
++}
++
++wrapper(getspnam_r, int, (const char *name, struct spwd *spbuf, char *buf, size_t buflen, struct spwd **spbufp))
++{
++	debug("getspnam_r(\"%s\")", name);
++	FILE *f = fopen("/etc/shadow", "rbe");
++	if (!f) {
++		return errno;
++	}
++	int res;
++	while (!(res = fgetspent_r(f, spbuf, buf, buflen, spbufp))) {
++		if (name && !strcmp(name, spbuf->sp_namp))
++			break;
++	}
++	fclose(f);
++	return res;
++}
++
++#else
++typedef int empty_translation_unit;
++#endif
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 0021b0a1..a1ec743d 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -22,6 +22,7 @@ TESTS = \
+     t/mkstemps.t \
+     t/mktemp.t \
+     t/opendir.t \
++    t/passwd.t \
+     t/popen.t \
+     t/posix_spawn.t \
+     t/posix_spawnp.t \
+diff --git a/test/src/Makefile.am b/test/src/Makefile.am
+index 5f5fde8d..594a8e0f 100644
+--- a/test/src/Makefile.am
++++ b/test/src/Makefile.am
+@@ -15,6 +15,7 @@ check_PROGRAMS = \
+     test-mkstemps \
+     test-mktemp \
+     test-opendir \
++    test-passwd \
+     test-popen \
+     test-posix_spawn \
+     test-posix_spawnp \
+diff --git a/test/src/test-passwd.c b/test/src/test-passwd.c
+new file mode 100644
+index 00000000..fb9c8c4c
+--- /dev/null
++++ b/test/src/test-passwd.c
+@@ -0,0 +1,28 @@
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++
++int main (int argc, char *argv[]) {
++	struct passwd *pwd;
++
++	if (argc != 2) {
++		fprintf(stderr, "Usage: %s username\n", argv[0]);
++		exit(EXIT_FAILURE);
++	}
++
++	pwd = getpwnam(argv[1]);
++	if (pwd == NULL) {
++		if (errno == 0) {
++			printf("Not found\n");
++		} else {
++			perror("getpwnam");
++		}
++		exit(EXIT_FAILURE);
++	}
++
++	printf("%jd\n", (intmax_t)(pwd->pw_uid));
++	exit(EXIT_SUCCESS);
++}
+diff --git a/test/t/passwd.t b/test/t/passwd.t
+new file mode 100755
+index 00000000..5c3414e0
+--- /dev/null
++++ b/test/t/passwd.t
+@@ -0,0 +1,23 @@
++#!/bin/sh
++
++srcdir=${srcdir:-.}
++. $srcdir/common.inc.sh
++
++prepare 4
++
++for chroot in chroot fakechroot; do
++    if [ $chroot = "chroot" ] && ! is_root; then
++        skip $(( $tap_plan / 2 )) "not root"
++    else
++
++        t=`$srcdir/$chroot.sh $testtree /bin/test-passwd user 2>&1`
++        test "$t" = "1337" || not
++        ok "$chroot uid is" $t
++
++        t=`$srcdir/$chroot.sh $testtree getent group user 2>&1`
++        test "$t" = "user:x:1337:" || not
++        ok "$chroot getent group user is" $t
++    fi
++done
++
++cleanup
+diff --git a/test/testtree.sh b/test/testtree.sh
+index ee35fc26..d857a195 100755
+--- a/test/testtree.sh
++++ b/test/testtree.sh
+@@ -32,6 +32,10 @@ do
+     mkdir -p $destdir/$d
+ done
+ 
++echo "user:x:1337:1337:user:/home/user:/bin/bash" > $destdir/etc/passwd
++echo "root:x:0:" > $destdir/etc/group
++echo "user:x:1337:" >> $destdir/etc/group
++
+ for d in \
+     /dev \
+     /proc
+@@ -64,6 +68,7 @@ for p in \
+     '/usr/bin/dirname' \
+     '/usr/bin/env' \
+     '/usr/bin/find' \
++    '/usr/bin/getent' \
+     '/usr/bin/id' \
+     '/usr/bin/ischroot' \
+     '/usr/bin/less' \
+@@ -116,6 +121,7 @@ for p in \
+     'libm.so.*' \
+     'libncurses.so.*' \
+     'libncursesw.so.*' \
++    'libnss_*.so.*' \
+     'libpcre*.so.*' \
+     'libpthread.so.*' \
+     'libreadline.so.*' \
+
+From d9a47178203931231987d10117acb5684d12ed4c Mon Sep 17 00:00:00 2001
+From: Johannes Schauer Marin Rodrigues 
+Date: Tue, 1 Nov 2022 00:47:56 +0100
+Subject: [PATCH 08/11] add test/t/rm.t and amend test/t/touch.t with
+ --no-dereference test
+
+ - test/t/rm.t will fail under glibc 2.34 unless __stat64_time64 functions are
+   wrapped
+ - test/t/touch.t will fail under glibc 2.34 unless __lstat64_time64 is
+   wrapped
+---
+ test/Makefile.am |  1 +
+ test/t/rm.t      | 25 +++++++++++++++++++++++++
+ test/t/touch.t   | 17 +++++++++++++++--
+ 3 files changed, 41 insertions(+), 2 deletions(-)
+ create mode 100755 test/t/rm.t
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index a1ec743d..88e740e5 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -29,6 +29,7 @@ TESTS = \
+     t/pwd.t \
+     t/readlink.t \
+     t/realpath.t \
++    t/rm.t \
+     t/socket-af_unix.t \
+     t/statfs.t \
+     t/statvfs.t \
+diff --git a/test/t/rm.t b/test/t/rm.t
+new file mode 100755
+index 00000000..9ecf88c9
+--- /dev/null
++++ b/test/t/rm.t
+@@ -0,0 +1,25 @@
++#!/bin/sh
++
++srcdir=${srcdir:-.}
++. $srcdir/common.inc.sh
++
++prepare 2
++
++for chroot in chroot fakechroot; do
++
++    if [ $chroot = "chroot" ] && ! is_root; then
++        skip $(( $tap_plan / 2 )) "not root"
++    else
++
++        mkdir -p $testtree/dir-$chroot
++        echo 'something' > $testtree/dir-$chroot/file
++
++        $srcdir/$chroot.sh $testtree /bin/sh -c "rm -r /dir-$chroot"
++        test -e $testtree/dir-$chroot && not
++        ok "$chroot rm -r /dir-$chroot:" $t
++
++    fi
++
++done
++
++cleanup
+diff --git a/test/t/touch.t b/test/t/touch.t
+index fbea316b..cc05a2ba 100755
+--- a/test/t/touch.t
++++ b/test/t/touch.t
+@@ -3,12 +3,12 @@
+ srcdir=${srcdir:-.}
+ . $srcdir/common.inc.sh
+ 
+-prepare 16
++prepare 24
+ 
+ . $srcdir/touch.inc.sh
+ 
+ if [ -z "$touch" ]; then
+-    skip 16 "touch not found"
++    skip 24 "touch not found"
+ else
+ 
+     for chroot in chroot fakechroot; do
+@@ -37,6 +37,19 @@ else
+ 
+             sleep 1
+ 
++            # with --no-dereference, on 32bit, touch will use __lstat64_time64
++            t=`$srcdir/$chroot.sh $testtree $touch -h -r /tmp/$chroot-touch.txt /tmp/$chroot-touch2.txt 2>&1`
++            test "$t" = "" || not
++            ok "$chroot touch -r" $t
++            test -f $testtree/tmp/$chroot-touch2.txt || not
++            ok "$chroot $chroot-touch2.txt exists"
++            test $testtree/tmp/$chroot-touch2.txt -nt $testtree/tmp/$chroot-touch.txt && not
++            ok "$chroot $chroot-touch2.txt is not newer than touch.txt"
++            test $testtree/tmp/$chroot-touch2.txt -ot $testtree/tmp/$chroot-touch.txt && not
++            ok "$chroot $chroot-touch2.txt is not older than $chroot-touch.txt"
++
++            sleep 1
++
+             t=`$srcdir/$chroot.sh $testtree $touch -m /tmp/$chroot-touch.txt 2>&1`
+             test "$t" = "" || not
+             ok "$chroot touch -m" $t
+
+From dac74cd68cfb6eeaae9cd13bdc48737a44980df9 Mon Sep 17 00:00:00 2001
+From: Johannes Schauer Marin Rodrigues 
+Date: Tue, 1 Nov 2022 00:48:23 +0100
+Subject: [PATCH 09/11] support glibc 2.34 by wrapping
+ __{f,l,}stat{at,}64_time64 and__utime{nsat,s,}64
+
+These functions are only wrapped on 32 bit platforms like i386, armel or
+armhf. On 64 bit platforms, the corresponding HAVE_* macros will not be
+defined.
+
+ * __fstatat64_time64
+ * __lstat64_time64
+ * __stat64_time64
+ * __utime64
+ * __utimensat64
+ * __utimes64
+---
+ configure.ac             |  6 +++++
+ src/Makefile.am          |  6 +++++
+ src/__fstatat64_time64.c | 44 ++++++++++++++++++++++++++++++++++++
+ src/__lstat64_time64.c   | 49 ++++++++++++++++++++++++++++++++++++++++
+ src/__stat64_time64.c    | 47 ++++++++++++++++++++++++++++++++++++++
+ src/__utime64.c          | 41 +++++++++++++++++++++++++++++++++
+ src/__utimensat64.c      | 42 ++++++++++++++++++++++++++++++++++
+ src/__utimes64.c         | 42 ++++++++++++++++++++++++++++++++++
+ 8 files changed, 277 insertions(+)
+ create mode 100644 src/__fstatat64_time64.c
+ create mode 100644 src/__lstat64_time64.c
+ create mode 100644 src/__stat64_time64.c
+ create mode 100644 src/__utime64.c
+ create mode 100644 src/__utimensat64.c
+ create mode 100644 src/__utimes64.c
+
+diff --git a/configure.ac b/configure.ac
+index 5b3053e1..26c06116 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -158,11 +158,13 @@ ACX_CHECK_FTS_NAME_TYPE
+ # Checks for library functions.
+ AC_CHECK_FUNCS(m4_normalize([
+     __chk_fail
++    __fstatat64_time64
+     __fxstat64
+     __fxstatat
+     __fxstatat64
+     __getcwd_chk
+     __getwd_chk
++    __lstat64_time64
+     __lxstat
+     __lxstat64
+     __open
+@@ -175,7 +177,11 @@ AC_CHECK_FUNCS(m4_normalize([
+     __realpath_chk
+     __readlink_chk
+     __readlinkat_chk
++    __stat64_time64
+     __statfs
++    __utime64
++    __utimensat64
++    __utimes64
+     __xmknod
+     __xmknodat
+     __xstat
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6e9d9ae1..55193a96 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,9 +1,11 @@
+ pkglib_LTLIBRARIES = libfakechroot.la
+ libfakechroot_la_SOURCES = \
++    __fstatat64_time64.c \
+     __fxstatat.c \
+     __fxstatat64.c \
+     __getcwd_chk.c \
+     __getwd_chk.c \
++    __lstat64_time64.c \
+     __lxstat.c \
+     __lxstat64.c \
+     __lxstat64.h \
+@@ -18,7 +20,11 @@ libfakechroot_la_SOURCES = \
+     __readlinkat_chk.c \
+     __realpath_chk.c \
+     __realpath_chk.h \
++    __stat64_time64.c \
+     __statfs.c \
++    __utime64.c \
++    __utimensat64.c \
++    __utimes64.c \
+     __xmknod.c \
+     __xmknodat.c \
+     __xstat.c \
+diff --git a/src/__fstatat64_time64.c b/src/__fstatat64_time64.c
+new file mode 100644
+index 00000000..47a401f2
+--- /dev/null
++++ b/src/__fstatat64_time64.c
+@@ -0,0 +1,44 @@
++/*
++    libfakechroot -- fake chroot environment
++    Copyright (c) 2010, 2021 Piotr Roszatycki 
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++*/
++
++
++#include 
++
++#ifdef HAVE___FSTATAT64_TIME64
++
++#define _ATFILE_SOURCE
++#define _POSIX_C_SOURCE 200809L
++#include 
++#include 
++#include "libfakechroot.h"
++
++struct __stat64_t64;
++
++wrapper(__fstatat64_time64, int, (int dirfd, const char *pathname, struct __stat64_t64 *buf, int flags))
++{
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
++    debug("__fstatat64_time64(%d, \"%s\", &buf, %d)", dirfd, pathname, flags);
++    expand_chroot_path_at(dirfd, pathname);
++    return nextcall(__fstatat64_time64)(dirfd, pathname, buf, flags);
++}
++
++#else
++typedef int empty_translation_unit;
++#endif
+diff --git a/src/__lstat64_time64.c b/src/__lstat64_time64.c
+new file mode 100644
+index 00000000..e3e84002
+--- /dev/null
++++ b/src/__lstat64_time64.c
+@@ -0,0 +1,49 @@
++/*
++    libfakechroot -- fake chroot environment
++    Copyright (c) 2010, 2021 Piotr Roszatycki 
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++*/
++
++
++#include 
++
++#ifdef HAVE___LSTAT64_TIME64
++
++#define _ATFILE_SOURCE
++#define _POSIX_C_SOURCE 200809L
++#include 
++#include 
++#include "libfakechroot.h"
++
++struct __stat64_t64;
++
++wrapper(__lstat64_time64, int, (const char *filename, struct __stat64_t64 *buf))
++{
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
++    char resolved[FAKECHROOT_PATH_MAX];
++    debug("__lstat64_time64(\"%s\", &buf)", filename);
++    if (rel2abs(filename, resolved) == NULL) {
++        return -1;
++    }
++    filename = resolved;
++    expand_chroot_path(filename);
++    return nextcall(__lstat64_time64)(filename, buf);
++}
++
++#else
++typedef int empty_translation_unit;
++#endif
+diff --git a/src/__stat64_time64.c b/src/__stat64_time64.c
+new file mode 100644
+index 00000000..1b65345e
+--- /dev/null
++++ b/src/__stat64_time64.c
+@@ -0,0 +1,47 @@
++/*
++    libfakechroot -- fake chroot environment
++    Copyright (c) 2010-2015 Piotr Roszatycki 
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++*/
++
++
++#include 
++
++#ifdef HAVE___STAT64_TIME64
++
++#define _BSD_SOURCE
++#define _LARGEFILE64_SOURCE
++#define _DEFAULT_SOURCE
++#include 
++#include 
++#include 
++
++#include "libfakechroot.h"
++
++struct __stat64_t64;
++
++wrapper(__stat64_time64, int, (const char * file_name, struct __stat64_t64 * buf))
++{
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
++    debug("__stat64_time64(\"%s\", &buf)", file_name);
++    expand_chroot_path(file_name);
++    return nextcall(__stat64_time64)(file_name, buf);
++}
++
++#else
++typedef int empty_translation_unit;
++#endif
+diff --git a/src/__utime64.c b/src/__utime64.c
+new file mode 100644
+index 00000000..65d6e831
+--- /dev/null
++++ b/src/__utime64.c
+@@ -0,0 +1,41 @@
++/*
++    libfakechroot -- fake chroot environment
++    Copyright (c) 2010, 2013 Piotr Roszatycki 
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++*/
++
++
++#include 
++
++#ifdef HAVE___UTIME64
++
++#define _ATFILE_SOURCE
++#define _POSIX_C_SOURCE 200809L
++#include 
++#include "libfakechroot.h"
++
++wrapper(__utime64, int, (const char * filename, const struct utimbuf * buf))
++{
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
++    debug("__utime64(\"%s\", &buf)", filename);
++    expand_chroot_path(filename);
++    return nextcall(__utime64)(filename, buf);
++}
++
++#else
++typedef int empty_translation_unit;
++#endif
+diff --git a/src/__utimensat64.c b/src/__utimensat64.c
+new file mode 100644
+index 00000000..3973d64c
+--- /dev/null
++++ b/src/__utimensat64.c
+@@ -0,0 +1,42 @@
++/*
++    libfakechroot -- fake chroot environment
++    Copyright (c) 2010, 2013 Piotr Roszatycki 
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++*/
++
++
++#include 
++
++#ifdef HAVE___UTIMENSAT64
++
++#define _ATFILE_SOURCE
++#define _POSIX_C_SOURCE 200809L
++#include 
++#include "libfakechroot.h"
++
++
++wrapper(__utimensat64, int, (int dirfd, const char * pathname, const struct timespec times [2], int flags))
++{
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
++    debug("utimeat(%d, \"%s\", &buf, %d)", dirfd, pathname, flags);
++    expand_chroot_path_at(dirfd, pathname);
++    return nextcall(__utimensat64)(dirfd, pathname, times, flags);
++}
++
++#else
++typedef int empty_translation_unit;
++#endif
+diff --git a/src/__utimes64.c b/src/__utimes64.c
+new file mode 100644
+index 00000000..03e57d16
+--- /dev/null
++++ b/src/__utimes64.c
+@@ -0,0 +1,42 @@
++/*
++    libfakechroot -- fake chroot environment
++    Copyright (c) 2010, 2013 Piotr Roszatycki 
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++*/
++
++
++#include 
++
++#ifdef HAVE___UTIMES64
++
++#define _ATFILE_SOURCE
++#define _POSIX_C_SOURCE 200809L
++
++#include 
++#include "libfakechroot.h"
++
++wrapper(__utimes64, int, (const char * filename, UTIMES_TYPE_ARG2(tv)))
++{
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
++    debug("__utimes64(\"%s\", &tv)", filename);
++    expand_chroot_path(filename);
++    return nextcall(__utimes64)(filename, tv);
++}
++
++#else
++typedef int empty_translation_unit;
++#endif
+
+From 117d2e6e741bc4ff47e41e6879ca9e9821755ffd Mon Sep 17 00:00:00 2001
+From: Johannes Schauer Marin Rodrigues 
+Date: Tue, 31 Jan 2023 11:43:33 +0100
+Subject: [PATCH 10/11] also investigate .interp section for architectures that
+ do not list the linker in `objdump -p` like mips64el, ppc64el and s390x
+
+---
+ scripts/ldd.fakechroot.pl | 33 +++++++++++++++++++++++++++++++++
+ test/Makefile.am          |  1 +
+ test/t/ldd_interp.t       | 26 ++++++++++++++++++++++++++
+ 3 files changed, 60 insertions(+)
+ create mode 100755 test/t/ldd_interp.t
+
+diff --git a/scripts/ldd.fakechroot.pl b/scripts/ldd.fakechroot.pl
+index b4bb2a8c..13a94540 100755
+--- a/scripts/ldd.fakechroot.pl
++++ b/scripts/ldd.fakechroot.pl
+@@ -124,6 +124,38 @@ sub objdump {
+     }
+ }
+ 
++# mips64el, ppc64el and s390x do not list the linker itself
++# if it's missing, obtain it from the .interp section
++#
++# mips64el: /lib64/ld.so.1
++# ppc64el: /lib64/ld64.so.2
++# s390x: /lib/ld64.so.1
++sub elfinterp {
++    my $file = shift;
++    my $res = '';
++    local *PIPE;
++    open PIPE, "objdump -sj .interp '$file' 2>/dev/null |";
++    while (my $line = ) {
++        if ( $line !~ /^ [a-f0-9]+ ([a-f0-9][a-f0-9][a-f0-9 ]{6} [a-f0-9 ]{8} [a-f0-9 ]{8} [a-f0-9 ]{8})  /) {
++            next;
++        }
++        $line = $1;
++        $line =~ s/ //g;
++        $line =~ s/(..)/chr(hex($1))/eg;
++        $res .= $line;
++    }
++    close PIPE;
++
++    # remove trailing NUL byte
++    $res =~ s/\000$//;
++
++    # only add if it is missing
++    if ( $res && !exists $Libs{$res} ) {
++        push @Libs, $res;
++        $Libs{$res} = '';
++    }
++}
++
+ 
+ sub load_ldsoconf {
+     my ($file) = @_;
+@@ -191,6 +223,7 @@ sub load_ldsoconf {
+         }
+ 
+         objdump($file);
++        elfinterp($file_in_chroot);
+ 
+         if ($Dynamic == 0) {
+             print "\tnot a dynamic executable\n";
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 88e740e5..d7f98f03 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -19,6 +19,7 @@ TESTS = \
+     t/host.t \
+     t/java.t \
+     t/jemalloc.t \
++    t/ldd_interp.t \
+     t/mkstemps.t \
+     t/mktemp.t \
+     t/opendir.t \
+diff --git a/test/t/ldd_interp.t b/test/t/ldd_interp.t
+new file mode 100755
+index 00000000..7c968bb8
+--- /dev/null
++++ b/test/t/ldd_interp.t
+@@ -0,0 +1,26 @@
++#!/bin/sh
++
++srcdir=${srcdir:-.}
++. $srcdir/common.inc.sh
++
++plan 1
++
++pwd=`dirname $0`
++abs_top_srcdir=${abs_top_srcdir:-`cd "$pwd/../.." 2>/dev/null && pwd -P`}
++
++interp_file=$(file /bin/true | sed 's/^.*, interpreter \([^,]\+\), .*$/\1/')
++interp_readelf=$(readelf --string-dump=.interp /bin/true | sed -ne 's/^  \[ \+[0-9]\+\]  //p')
++
++# diag "$interp_file" "$interp_readelf"
++
++test "$interp_file" = "$interp_readelf" || not
++
++# ldd /bin/true | diag
++
++ldd /bin/true | grep --quiet "^[[:space:]]$interp_file (" || not
++
++# "$abs_top_srcdir/scripts/ldd.fakechroot" /bin/true | diag
++
++"$abs_top_srcdir/scripts/ldd.fakechroot" /bin/true | grep --quiet "^[[:space:]]$interp_file (" || not
++
++ok "ldd lists interpreter $interp_file"
+
+From 1617833d4bfa415cbe2fc1e961cb751e47697c24 Mon Sep 17 00:00:00 2001
+From: Johannes Schauer Marin Rodrigues 
+Date: Mon, 6 Feb 2023 10:42:40 +0100
+Subject: [PATCH 11/11] test/touch.inc.sh: use testtree variable
+
+ - the variable is set in test/common.inc.sh and includes `basename $0 .t`
+ - otherwise test/t/touch.t will always get skipped
+---
+ test/touch.inc.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/touch.inc.sh b/test/touch.inc.sh
+index 25e0dc01..76c21321 100644
+--- a/test/touch.inc.sh
++++ b/test/touch.inc.sh
+@@ -1,6 +1,6 @@
+-if [ -x testtree/usr/bin/touch ]; then
++if [ -x $testtree/usr/bin/touch ]; then
+     touch=/usr/bin/touch
+-elif [ -x testtree/bin/touch ]; then
++elif [ -x $testtree/bin/touch ]; then
+     touch=/bin/touch
+ else
+     touch=
diff --git a/system/fakechroot/patches/80.patch b/system/fakechroot/patches/80.patch
new file mode 100644
index 00000000000..86e586017d5
--- /dev/null
+++ b/system/fakechroot/patches/80.patch
@@ -0,0 +1,22 @@
+From e291eb96db42f20a55f917aae660d416d624acaa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= 
+Date: Fri, 4 Dec 2020 09:30:42 -0500
+Subject: [PATCH] Fix typo in AC_PATH_PROG for ldconfig
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index f8cdb323..d391494d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -49,7 +49,7 @@ AC_PATH_PROG([ENV], [env], [/usr/bin/env], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/l
+ AC_PATH_PROG([FAKEROOT], [fakeroot], [/usr/bin/fakeroot], [/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin:$PATH])
+ AC_PATH_PROG([INSSERV], [insserv], [/sbin/insserv], [/sbin:/usr/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin:$PATH])
+ AC_PATH_PROG([ISCHROOT], [ischroot], [/usr/bin/ischroot], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH])
+-AC_PATH_PROG([LDCONFIG], [ldconfig], [/sbin/chroot], [/sbin:/usr/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin:$PATH])
++AC_PATH_PROG([LDCONFIG], [ldconfig], [/sbin/ldconfig], [/sbin:/usr/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin:$PATH])
+ AC_PATH_PROG([LDD], [ldd], [/usr/bin/ldd], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH])
+ AC_PATH_PROG([LS], [ls], [/bin/ls], [/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH])
+ AC_PATH_PROG([MKFIFO], [mkfifo], [/usr/bin/mkfifo], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH])
diff --git a/system/fakechroot/patches/autoupdate.patch b/system/fakechroot/patches/autoupdate.patch
new file mode 100644
index 00000000000..9393713497a
--- /dev/null
+++ b/system/fakechroot/patches/autoupdate.patch
@@ -0,0 +1,40 @@
+--- fakechroot-2.20.1.orig/configure.ac	2019-03-22 21:02:42.000000000 +0000
++++ fakechroot-2.20.1/configure.ac	2023-02-09 00:46:10.059938547 +0000
+@@ -1,10 +1,10 @@
+-AC_PREREQ(2.64)
+-AC_INIT([fakechroot], [2.20.1], [dexter@debian.org], [fakechroot], [https://github.com/dex4er/fakechroot])
++AC_PREREQ([2.71])
++AC_INIT([fakechroot],[2.20.1],[dexter@debian.org],[fakechroot],[https://github.com/dex4er/fakechroot])
+ 
+ AC_CONFIG_SRCDIR([src/libfakechroot.c])
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_MACRO_DIR([m4])
+-AC_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ AM_INIT_AUTOMAKE([1.10 foreign])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+@@ -19,8 +19,8 @@ AM_PROG_AR
+ AC_PROG_CC
+ AC_PROG_MAKE_SET
+ AC_PROG_LN_S
+-AM_PROG_LIBTOOL
+-AM_PROG_NM
++LT_INIT
++LT_PATH_NM
+ LT_INIT
+ 
+ AC_CANONICAL_HOST
+@@ -77,7 +77,11 @@ AC_CHECK_LIB([dl], [dlsym])
+ 
+ # Checks for header files.
+ AC_HEADER_DIRENT
+-AC_HEADER_STDC
++# Autoupdate added the next two lines to ensure that your configure
++# script's behavior did not change.  They are probably safe to remove.
++AC_CHECK_INCLUDES_DEFAULT
++AC_PROG_EGREP
++
+ AC_CHECK_HEADERS(m4_normalize([
+     alloca.h
+     dirent.h
diff --git a/system/fakechroot/patches/b42d1fb9538f680af2f31e864c555414ccba842a.patch b/system/fakechroot/patches/b42d1fb9538f680af2f31e864c555414ccba842a.patch
new file mode 100644
index 00000000000..5e4a96e7096
--- /dev/null
+++ b/system/fakechroot/patches/b42d1fb9538f680af2f31e864c555414ccba842a.patch
@@ -0,0 +1,102 @@
+From b42d1fb9538f680af2f31e864c555414ccba842a Mon Sep 17 00:00:00 2001
+From: Piotr Roszatycki 
+Date: Mon, 10 Feb 2020 13:59:10 -0800
+Subject: [PATCH] New `statx` function
+
+---
+ NEWS.md         |  1 +
+ configure.ac    |  1 +
+ src/Makefile.am |  1 +
+ src/statx.c     | 44 ++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 47 insertions(+)
+ create mode 100644 src/statx.c
+
+diff --git a/NEWS.md b/NEWS.md
+index 9de12fe..f1210bf 100644
+--- a/NEWS.md
++++ b/NEWS.md
+@@ -1,5 +1,10 @@
+ # NEWS
+ 
++XX Xxx XXXX
++
++* UNRELEASED
++* New `statx(2)` function was added: glibc supports it since 2.28.
++
+ ## Version 2.20.1
+ 
+ 22 Mar 2019
+diff --git a/configure.ac b/configure.ac
+index a654edd..f8cdb32 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -277,6 +277,7 @@ AC_CHECK_FUNCS(m4_normalize([
+     statfs64
+     statvfs
+     statvfs64
++    statx
+     stpcpy
+     strchrnul
+     strlcpy
+diff --git a/src/Makefile.am b/src/Makefile.am
+index d729b0e..6066345 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -152,6 +152,7 @@ libfakechroot_la_SOURCES = \
+     statfs64.c \
+     statvfs.c \
+     statvfs64.c \
++    statx.c \
+     stpcpy.c \
+     strchrnul.c \
+     strchrnul.h \
+diff --git a/src/statx.c b/src/statx.c
+new file mode 100644
+index 0000000..524f73e
+--- /dev/null
++++ b/src/statx.c
+@@ -0,0 +1,44 @@
++/*
++    libfakechroot -- fake chroot environment
++    Copyright (c) 2010-2020 Piotr Roszatycki 
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library; if not, write to the Free Software
++    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++*/
++
++
++#include 
++
++#ifdef HAVE_STATX
++
++#define _GNU_SOURCE
++#include 
++#include 
++#include 
++
++#include "libfakechroot.h"
++
++
++wrapper(statx, int, (int dirfd, const char * pathname, int flags, unsigned int mask, struct statx * statxbuf))
++{
++    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
++    char fakechroot_buf[FAKECHROOT_PATH_MAX];
++    debug("statx(%d, \"%s\", %d, %u, &statxbuf)", dirfd, pathname, flags, mask);
++    expand_chroot_path_at(dirfd, pathname);
++    return nextcall(statx)(dirfd, pathname, flags, mask, statxbuf);
++}
++
++#else
++typedef int empty_translation_unit;
++#endif
diff --git a/system/fakechroot/patches/disable_cp.t.patch b/system/fakechroot/patches/disable_cp.t.patch
new file mode 100644
index 00000000000..1a7f90105d8
--- /dev/null
+++ b/system/fakechroot/patches/disable_cp.t.patch
@@ -0,0 +1,11 @@
+t/cp.t is problematic since RHEL 6 and 7 seems to me is a problem with the test and not with coreutils version
+--- ./test/Makefile.am.orig	2023-04-06 02:04:58.107925212 +0100
++++ ./test/Makefile.am	2023-04-06 02:05:03.453907064 +0100
+@@ -7,7 +7,6 @@ TESTS = \
+     t/chroot.t \
+     t/clearenv.t \
+     t/cmd-subst.t \
+-    t/cp.t \
+     t/dedotdot.t \
+     t/dladdr.t \
+     t/execlp.t \
diff --git a/system/fakechroot/patches/fix_test_on_32bits.patch b/system/fakechroot/patches/fix_test_on_32bits.patch
new file mode 100644
index 00000000000..26687f7f616
--- /dev/null
+++ b/system/fakechroot/patches/fix_test_on_32bits.patch
@@ -0,0 +1,38 @@
+removing leading / for some reason cp doesn't like it
+
+new coreutils already have -a and can replace -dp
+
+man cp
+
+-a, --archive same as -dR --preserve=all
+-d     same as --no-dereference --preserve=links
+-p     same as --preserve=mode,ownership,timestamps
+--- fakechroot-2.20.1/test/t/cp.t	2019-03-22 21:02:42.000000000 +0000
++++ fakechroot-2.20.1/test/t/cp.t	2022-03-04 02:07:11.511455404 +0000
+@@ -7,7 +7,7 @@ prepare 4
+ 
+ case "`uname -s`" in
+     Linux|KFreeBSD)
+-        CP_ARGS=-dp;;
++        CP_ARGS="--preserve=all";;
+     *)
+         CP_ARGS=-a;;
+ esac
+@@ -19,13 +19,13 @@ for chroot in chroot fakechroot; do
+     else
+ 
+         echo 'something' > $testtree/file-$chroot
+-        ln -s /file-$chroot $testtree/symlink-$chroot
++        ln -s file-$chroot $testtree/symlink-$chroot
+ 
+-        t=`$srcdir/$chroot.sh $testtree /bin/sh -c "cp $CP_ARGS /file-$chroot /file2-$chroot; cat /file2-$chroot" 2>&1`
++        t=`$srcdir/$chroot.sh $testtree /bin/sh -c "cp $CP_ARGS file-$chroot file2-$chroot; cat /file2-$chroot" 2>&1`
+         test "$t" = "something" || not
+-        ok "$chroot cp $CP_ARGS /file-$chroot /file2-$chroot:" $t
++        ok "$chroot cp $CP_ARGS file-$chroot file2-$chroot:" $t
+ 
+-        t=`$srcdir/$chroot.sh $testtree /bin/sh -c "cp $CP_ARGS /symlink-$chroot /symlink2-$chroot; cat /symlink2-$chroot" 2>&1`
++        t=`$srcdir/$chroot.sh $testtree /bin/sh -c "cp $CP_ARGS symlink-$chroot symlink2-$chroot; cat /symlink2-$chroot" 2>&1`
+         test "$t" = "something" || not
+         ok "$chroot cp $CP_ARGS /symlink-$chroot /symlink2-$chroot:" $t
+ 
diff --git a/system/fsv/fsv.SlackBuild b/system/fsv/fsv.SlackBuild
index 9384da8e2fb..fa8f6ee2f40 100644
--- a/system/fsv/fsv.SlackBuild
+++ b/system/fsv/fsv.SlackBuild
@@ -79,7 +79,7 @@ sed -i \
 sed -i 's/@DATADIRNAME@/share/' po/Makefile.in.in
 ./autogen.sh
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fpermissive" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/system/gnome-disk-utility/66.patch b/system/gnome-disk-utility/66.patch
new file mode 100644
index 00000000000..224e09a32df
--- /dev/null
+++ b/system/gnome-disk-utility/66.patch
@@ -0,0 +1,95 @@
+From 5c80d88f6c2662d215e3c00ef0012756bece8d3b Mon Sep 17 00:00:00 2001
+From: Manuel Wassermann 
+Date: Wed, 30 Mar 2022 13:56:41 +0200
+Subject: [PATCH 1/3] gduatasmartdialog: Replace deprecated GIO function
+
+---
+ src/disks/gduatasmartdialog.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/disks/gduatasmartdialog.c b/src/disks/gduatasmartdialog.c
+index da3116c17..2deb6618c 100644
+--- a/src/disks/gduatasmartdialog.c
++++ b/src/disks/gduatasmartdialog.c
+@@ -1684,15 +1684,15 @@ gdu_ata_smart_dialog_show (GduWindow    *window,
+ 
+   action = g_simple_action_new ("short", NULL);
+   g_signal_connect (action, "activate", G_CALLBACK (on_selftest_short), data);
+-  g_simple_action_group_insert (group, G_ACTION (action));
++  g_action_map_add_action (G_ACTION_MAP (group), G_ACTION (action));
+ 
+   action = g_simple_action_new ("extended", NULL);
+   g_signal_connect (action, "activate", G_CALLBACK (on_selftest_extended), data);
+-  g_simple_action_group_insert (group, G_ACTION (action));
++  g_action_map_add_action (G_ACTION_MAP (group), G_ACTION (action));
+ 
+   action = g_simple_action_new ("conveyance", NULL);
+   g_signal_connect (action, "activate", G_CALLBACK (on_selftest_conveyance), data);
+-  g_simple_action_group_insert (group, G_ACTION (action));
++  g_action_map_add_action (G_ACTION_MAP (group), G_ACTION (action));
+ 
+   gtk_widget_insert_action_group (GTK_WIDGET (data->dialog), "test", G_ACTION_GROUP (group));
+ 
+-- 
+GitLab
+
+
+From 1e42b8796e69d922382c91b5313cc8f86e871186 Mon Sep 17 00:00:00 2001
+From: Manuel Wassermann 
+Date: Wed, 30 Mar 2022 14:06:31 +0200
+Subject: [PATCH 2/3] gduformatdiskdialog: Fix parameter of g_signal_connect ()
+ and remove unused variable
+
+---
+ src/disks/gduformatdiskdialog.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/disks/gduformatdiskdialog.c b/src/disks/gduformatdiskdialog.c
+index 44a0280a0..2a0311722 100644
+--- a/src/disks/gduformatdiskdialog.c
++++ b/src/disks/gduformatdiskdialog.c
+@@ -436,7 +436,6 @@ gdu_format_disk_dialog_show (GduWindow    *window,
+                              UDisksObject *object)
+ {
+   FormatDiskData *data;
+-  gint response;
+ 
+   data = g_new0 (FormatDiskData, 1);
+   data->window = g_object_ref (window);
+@@ -470,6 +469,6 @@ gdu_format_disk_dialog_show (GduWindow    *window,
+   gtk_widget_show_all (data->dialog);
+   gtk_widget_grab_focus (data->type_combobox);
+ 
+-  g_signal_connect (data->dialog, "response", dialog_response_cb, data);
++  g_signal_connect (data->dialog, "response", G_CALLBACK (dialog_response_cb), data);
+   gtk_window_present (GTK_WINDOW (data->dialog));
+ }
+-- 
+GitLab
+
+
+From 465e2e45547ea586923f4be152f0caed112f8b25 Mon Sep 17 00:00:00 2001
+From: Manuel Wassermann 
+Date: Wed, 30 Mar 2022 14:09:27 +0200
+Subject: [PATCH 3/3] gduapplication: Fix parameter of g_signal_connect ()
+
+---
+ src/disks/gduapplication.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/disks/gduapplication.c b/src/disks/gduapplication.c
+index b97c38293..bca06e6bf 100644
+--- a/src/disks/gduapplication.c
++++ b/src/disks/gduapplication.c
+@@ -354,7 +354,7 @@ about_activated (GSimpleAction *action,
+ 
+   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (app->window));
+   gtk_widget_show_all (dialog);
+-  g_signal_connect (dialog, "response", on_about_dialog_response, NULL);
++  g_signal_connect (dialog, "response", G_CALLBACK (on_about_dialog_response), NULL);
+   gtk_window_present (GTK_WINDOW (dialog));
+ }
+ 
+-- 
+GitLab
+
diff --git a/system/gnome-disk-utility/gnome-disk-utility.SlackBuild b/system/gnome-disk-utility/gnome-disk-utility.SlackBuild
index 9cd4575abf1..03f19fba614 100644
--- a/system/gnome-disk-utility/gnome-disk-utility.SlackBuild
+++ b/system/gnome-disk-utility/gnome-disk-utility.SlackBuild
@@ -87,6 +87,8 @@ else
   echo "gnome-settings-daemon not found, disabling plugin."
 fi
 
+patch -p1 < $CWD/66.patch
+
 mkdir build
 cd build
   CFLAGS="$SLKCFLAGS" \
diff --git a/system/gnome-vfs/gnome-vfs.SlackBuild b/system/gnome-vfs/gnome-vfs.SlackBuild
index c30e90ed9b3..2f145faf488 100644
--- a/system/gnome-vfs/gnome-vfs.SlackBuild
+++ b/system/gnome-vfs/gnome-vfs.SlackBuild
@@ -79,7 +79,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-patch -p0 < $CWD/openssl-1.1.patch
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
 
 # Fix for the newer glib
 sed -i "/-DG_DISABLE_DEPRECATED/d" */Makefile.*
diff --git a/system/gnome-vfs/patches/gnome-vfs-2.8.2-browser_default.patch b/system/gnome-vfs/patches/gnome-vfs-2.8.2-browser_default.patch
new file mode 100644
index 00000000000..438a89de6e5
--- /dev/null
+++ b/system/gnome-vfs/patches/gnome-vfs-2.8.2-browser_default.patch
@@ -0,0 +1,20 @@
+--- gnome-vfs-2.8.2/schemas/desktop_gnome_url_handlers.schemas.in.browser_default	2004-10-18 21:38:08.605885937 -0400
++++ gnome-vfs-2.8.2/schemas/desktop_gnome_url_handlers.schemas.in	2004-10-18 21:38:20.470253994 -0400
+@@ -153,7 +153,7 @@
+       /desktop/gnome/url-handlers/http/command
+       gnome
+       string
+-      epiphany %s
++      gio open %s
+       
+         The handler for "http" URLs
+         The command used to handle "http" URLs, if enabled.
+@@ -187,7 +187,7 @@
+       /desktop/gnome/url-handlers/https/command
+       gnome
+       string
+-      epiphany %s
++      gio open %s
+       
+         The handler for "https" URLs
+         The command used to handle "https" URLs, if enabled.
diff --git a/system/gnome-vfs/patches/gnome-vfs2-c99.patch b/system/gnome-vfs/patches/gnome-vfs2-c99.patch
new file mode 100644
index 00000000000..a8b9b5d4165
--- /dev/null
+++ b/system/gnome-vfs/patches/gnome-vfs2-c99.patch
@@ -0,0 +1,16 @@
+Include  for the g_printf function.  This avoids an
+implicit function declaration and build failures with future
+compilers.
+
+diff --git a/test/test-async-directory.c b/test/test-async-directory.c
+index 2698d8e6e41f9ead..8d7e0f320edbb5fc 100644
+--- a/test/test-async-directory.c
++++ b/test/test-async-directory.c
+@@ -24,6 +24,7 @@
+ #include 
+ 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
diff --git a/system/gnome-vfs/patches/gnome-vfs2-configure-c99.patch b/system/gnome-vfs/patches/gnome-vfs2-configure-c99.patch
new file mode 100644
index 00000000000..829c31f0c63
--- /dev/null
+++ b/system/gnome-vfs/patches/gnome-vfs2-configure-c99.patch
@@ -0,0 +1,21 @@
+Avoid an implicit int and an implicit declaration of exit.  This
+prevents build failures with future compilers.
+
+diff --git a/configure.in b/configure.in
+index 1a0ad1be03f9f9fe..011c1d919885536a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -366,11 +366,11 @@ AC_TRY_RUN([
+ 
+ struct linger li;
+ 
+-main ()
++int main (void)
+ {
+     li.l_onoff = 1;
+     li.l_linger = 120;
+-    exit (0);
++    return 0;
+ }
+ ],[
+ AC_DEFINE(HAVE_STRUCT_LINGER, 1, [Define to 1 if struct linger is available])
diff --git a/system/gnome-vfs/openssl-1.1.patch b/system/gnome-vfs/patches/openssl-1.1.patch
similarity index 87%
rename from system/gnome-vfs/openssl-1.1.patch
rename to system/gnome-vfs/patches/openssl-1.1.patch
index 14207f28d19..3ed1d5edad0 100644
--- a/system/gnome-vfs/openssl-1.1.patch
+++ b/system/gnome-vfs/patches/openssl-1.1.patch
@@ -4,8 +4,8 @@ struct SSL is opaque in openssl-1.1; and the SSL_free() man page
 says that one should not free members of it manually (in both
 the openssl-1.0 and openssl-1.1 man pages).
 
---- libgnomevfs/gnome-vfs-ssl.c.orig	2010-02-09 12:16:14.000000000 +0000
-+++ libgnomevfs/gnome-vfs-ssl.c
+--- ./libgnomevfs/gnome-vfs-ssl.c.orig	2010-02-09 12:16:14.000000000 +0000
++++ ./libgnomevfs/gnome-vfs-ssl.c
 @@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
  			}
  		}
diff --git a/system/heirloom-sh/heirloom-sh-glibc-2.34.patch b/system/heirloom-sh/heirloom-sh-glibc-2.34.patch
new file mode 100644
index 00000000000..35cb5655269
--- /dev/null
+++ b/system/heirloom-sh/heirloom-sh-glibc-2.34.patch
@@ -0,0 +1,18 @@
+--- a/fault.c
++++ b/fault.c
+@@ -43,6 +43,15 @@
+ #include	
+ #include	
+ 
++#if __GLIBC__ >= 2
++# undef SIGSTKSZ
++# if defined __ia64__
++#  define SIGSTKSZ 262144
++# else
++#  define SIGSTKSZ 65536
++# endif
++#endif
++
+ static	void (*psig0_func)() = SIG_ERR;	/* previous signal handler for signal 0 */
+ static	char sigsegv_stack[SIGSTKSZ];
+ 
diff --git a/system/heirloom-sh/heirloom-sh.SlackBuild b/system/heirloom-sh/heirloom-sh.SlackBuild
index b805981e575..ce9edf218ed 100644
--- a/system/heirloom-sh/heirloom-sh.SlackBuild
+++ b/system/heirloom-sh/heirloom-sh.SlackBuild
@@ -61,6 +61,8 @@ find -L . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
   -o -perm 400 \) -exec chmod 644 {} \;
 
+patch -p1 < $CWD/heirloom-sh-glibc-2.34.patch
+
 # configure is the worst way to build a package except for all the others
 # 1. make static changes to the makefile with a patch
 patch -p1 < $CWD/makefile.patch
diff --git a/system/iotop/iotop.SlackBuild b/system/iotop/iotop.SlackBuild
index 9b57f5a9d00..526baad1418 100644
--- a/system/iotop/iotop.SlackBuild
+++ b/system/iotop/iotop.SlackBuild
@@ -69,7 +69,7 @@ patch -p1 < $CWD/fix-proc-status-read.patch
 
 sed -i 's|share/man/man8|man/man8|' setup.py
 
-python setup.py install --root=$PKG
+python2 setup.py install --root=$PKG
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
diff --git a/system/ktsuss/README b/system/ktsuss/README
deleted file mode 100644
index 83daa9d71dd..00000000000
--- a/system/ktsuss/README
+++ /dev/null
@@ -1,4 +0,0 @@
-ktsuss stands for "keep the su simple, stupid", and as the name says,
-is a graphical version (frontend) of su written in C and GTK+ 2. 
-
-The idea of the project is to remain simple and bug free.
diff --git a/system/ktsuss/ktsuss.SlackBuild b/system/ktsuss/ktsuss.SlackBuild
deleted file mode 100644
index 70ad2df91cd..00000000000
--- a/system/ktsuss/ktsuss.SlackBuild
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for ktsuss
-
-# Copyright 2008 Murat D. Kadirov 
-# Copyright 2009,2010  Robby Workman  Northport, AL, USA
-# Copyright 2012, 2015-2021  Petar Petrov slackalaxy@gmail.com
-# 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.
-
-# 20240331 bkw: Modified by SlackBuilds.org, BUILD=3:
-# - get rid of generic GNU INSTALL in doc dir.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=ktsuss
-VERSION=${VERSION:-20140711} # Use date as version
-COMMIT=${COMMIT:-99ea19743328a8e72b8b966635e44f1e816cf294}
-BUILD=${BUILD:-3}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$COMMIT
-tar xvf $CWD/$COMMIT.tar.gz || 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 \
-  -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 {} +
-
-./autogen.sh
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-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
-cp -a Changelog COPYING CREDITS LICENSE README.md $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
diff --git a/system/ktsuss/ktsuss.info b/system/ktsuss/ktsuss.info
deleted file mode 100644
index 75944f40f18..00000000000
--- a/system/ktsuss/ktsuss.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="ktsuss"
-VERSION="20140711"
-HOMEPAGE="https://github.com/nomius/ktsuss"
-DOWNLOAD="https://github.com/nomius/ktsuss/archive/99ea19743328a8e72b8b966635e44f1e816cf294/ktsuss-99ea19743328a8e72b8b966635e44f1e816cf294.tar.gz"
-MD5SUM="edd64e80af42c8fe8207d6dc37a1fab2"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Petar Petrov"
-EMAIL="slackalaxy@gmail.com"
diff --git a/system/ktsuss/slack-desc b/system/ktsuss/slack-desc
deleted file mode 100644
index c6a9ee31d58..00000000000
--- a/system/ktsuss/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------------------------------------------------------|
-ktsuss: ktsuss (keep the su simple, stupid)
-ktsuss:
-ktsuss: ktsuss is a graphical version of su written in C and GTK+ 2.
-ktsuss:
-ktsuss:
-ktsuss:
-ktsuss:
-ktsuss:
-ktsuss:
-ktsuss:
-ktsuss:
diff --git a/system/lirc/lirc.SlackBuild b/system/lirc/lirc.SlackBuild
index d73d5ef824e..cd120ae5b72 100644
--- a/system/lirc/lirc.SlackBuild
+++ b/system/lirc/lirc.SlackBuild
@@ -41,11 +41,13 @@
 # /usr/doc/$PRGNAM-$VERSION, instead of /usr/share/doc/$PRGNAM. Also
 # don't include useless INSTALL in doc dir.
 
+# 20241124 KEC: version 0.10.2.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=lirc
-VERSION=${VERSION:-0.9.3a}
-BUILD=${BUILD:-5}
+VERSION=${VERSION:-0.10.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -99,28 +101,6 @@ patch -p1 < $CWD/datarootdir.patch
 # Thanks to Martin Schmidt for the heads up and the patch
 patch -p1 < $CWD/gi.patch
 
-# 20220211 bkw: Fix for PyYAML >= 5.1
-sed -i \
-  's|yaml.load(f.read())|yaml.load(f.read(), Loader=yaml.FullLoader)|' \
-  tools/check_configs.py \
-  tools/lirc-setup/mvc_model.py \
-  doc/data2hwdb \
-  doc/data2table
-
-# 20220211 bkw: Source ships with HTML conversions of man pages, but
-# make thinks it needs to regenerate them. Touching them doesn't help,
-# it always tries to convert them regardless of timestamps. And the
-# conversion fails, because our man2html (from man-db) doesn't support
-# the -M and -r options. It doesn't stop the Makefile from finishing,
-# but all the html pages end up broken/useless. The configure script
-# reads an environment variable MAN2HTML, which... does nothing. We
-# can't even copy them, let make overwrite them, and restore the
-# originals, because 'make install' will regenerate them again.
-
-# So save the originals, let 'make install' generate and install the
-# broken ones, then copy the originals to $PKG/usr/doc afterwards.
-cp -a doc/man-html doc/man-html.shipped
-
 MAN2HTML=no \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -139,12 +119,6 @@ make -j1
 # doc/Makefile, unless we set it here also.
 make install-strip DESTDIR=$PKG docdir=/usr/doc/$PRGNAM-$VERSION
 
-# 20220211 bkw: $PKG/usr/doc now contains a bunch of broken HTML
-# files that just contain the usage message for man2html. Replace them
-# with pre-generated files upstream ships. Why does this have to be
-# so complex?
-cp -a doc/man-html.shipped/*.html $PKG/usr/doc/$PRGNAM-$VERSION/lirc.org/html
-
 gzip -9 $PKG/usr/man/man*/*
 
 # 20220211 bkw: not sure if the .la files in /usr/lib(64?)/lirc/plugins
@@ -153,17 +127,17 @@ gzip -9 $PKG/usr/man/man*/*
 rm -f $PKG/usr/lib*/*.la
 
 mkdir -p $PKG/lib/udev/rules.d
-cat contrib/lirc.rules > $PKG/lib/udev/rules.d/96-lirc.rules
+cat contrib/60-lirc.rules > $PKG/lib/udev/rules.d/60-lirc.rules
 
 mkdir -p $PKG/etc/logrotate.d
 cat contrib/lircd.conf > $PKG/etc/lircd.conf.new
 cat contrib/lircmd.conf > $PKG/etc/lircmd.conf.new
-cat contrib/lircrc > $PKG/etc/lircrc.new
+# KEC: This might not be the right file to use.
+cat contrib/lircrc/lircrc > $PKG/etc/lircrc.new
 cat $CWD/lirc.logrotate > $PKG/etc/logrotate.d/lirc.new
 
 PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 
-# HTML docs are already installed in $PKGDOC/html
 cp -a AUTHORS COPYING ChangeLog NEWS README doc/irxevent.keys $PKGDOC
 cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
diff --git a/system/lirc/lirc.info b/system/lirc/lirc.info
index 41a9697d3b0..ca79b5a4077 100644
--- a/system/lirc/lirc.info
+++ b/system/lirc/lirc.info
@@ -1,8 +1,8 @@
 PRGNAM="lirc"
-VERSION="0.9.3a"
+VERSION="0.10.2"
 HOMEPAGE="http://www.lirc.org/"
-DOWNLOAD="http://downloads.sourceforge.net/project/lirc/LIRC/0.9.3a/lirc-0.9.3a.tar.bz2"
-MD5SUM="f9ed5dd0684a52c7cd98672e71e81b05"
+DOWNLOAD="http://downloads.sourceforge.net/project/lirc/LIRC/0.10.2/lirc-0.10.2.tar.bz2"
+MD5SUM="cb96cfb0af8067c0062e2f5a100f426a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/lxsession/gcc14.patch b/system/lxsession/gcc14.patch
new file mode 100644
index 00000000000..5e612edc6a2
--- /dev/null
+++ b/system/lxsession/gcc14.patch
@@ -0,0 +1,89 @@
+From a0d8f8b865ce25867983cd45720adfff33b3fdfb Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA 
+Date: Sun, 25 Feb 2024 16:58:43 +0900
+Subject: [PATCH] Fix: support gcc14 -Werror=incompatible-pointer-types
+
+gcc14 now defaults to -Werror=incompatible-pointer-types.
+To support compilation with gcc14, cast GTK related objects
+properly.
+---
+ lxpolkit/lxpolkit-listener.c | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/lxpolkit/lxpolkit-listener.c b/lxpolkit/lxpolkit-listener.c
+index 00bda42..819d2c5 100644
+--- a/lxpolkit/lxpolkit-listener.c
++++ b/lxpolkit/lxpolkit-listener.c
+@@ -85,13 +85,13 @@ static void on_completed(PolkitAgentSession* session, gboolean authorized, DlgDa
+ 
+     if(!authorized && !g_cancellable_is_cancelled(data->cancellable))
+     {
+-        show_msg(data->dlg, GTK_MESSAGE_ERROR, _("Authentication failed!\nWrong password?"));
++        show_msg(GTK_WINDOW(data->dlg), GTK_MESSAGE_ERROR, _("Authentication failed!\nWrong password?"));
+         /* initiate a new session */
+         g_object_unref(data->session);
+         data->session = NULL;
+-        gtk_entry_set_text(data->request, "");
++        gtk_entry_set_text(GTK_ENTRY(data->request), "");
+         gtk_widget_grab_focus(data->request);
+-        on_user_changed(data->id, data);
++        on_user_changed(GTK_COMBO_BOX(data->id), data);
+         return;
+     }
+     g_simple_async_result_complete(data->result);
+@@ -106,20 +106,20 @@ static void on_request(PolkitAgentSession* session, gchar* request, gboolean ech
+         msg = _("Password: ");
+     else
+         msg = request;
+-    gtk_label_set_text(data->request_label, msg);
+-    gtk_entry_set_visibility(data->request, echo_on);
++    gtk_label_set_text(GTK_LABEL(data->request_label), msg);
++    gtk_entry_set_visibility(GTK_ENTRY(data->request), echo_on);
+ }
+ 
+ static void on_show_error(PolkitAgentSession* session, gchar* text, DlgData* data)
+ {
+     DEBUG("on error: %s", text);
+-    show_msg(data->dlg, GTK_MESSAGE_ERROR, text);
++    show_msg(GTK_WINDOW(data->dlg), GTK_MESSAGE_ERROR, text);
+ }
+ 
+ static void on_show_info(PolkitAgentSession* session, gchar* text, DlgData* data)
+ {
+     DEBUG("on info: %s", text);
+-    show_msg(data->dlg, GTK_MESSAGE_INFO, text);
++    show_msg(GTK_WINDOW(data->dlg), GTK_MESSAGE_INFO, text);
+ }
+ 
+ void on_dlg_response(GtkDialog* dlg, int response, DlgData* data)
+@@ -127,7 +127,7 @@ void on_dlg_response(GtkDialog* dlg, int response, DlgData* data)
+     DEBUG("on_response: %d", response);
+     if(response == GTK_RESPONSE_OK)
+     {
+-        const char* request = gtk_entry_get_text(data->request);
++        const char* request = gtk_entry_get_text(GTK_ENTRY(data->request));
+         polkit_agent_session_response(data->session, request);
+         gtk_widget_set_sensitive(data->dlg, FALSE);
+     }
+@@ -195,7 +195,7 @@ static void initiate_authentication(PolkitAgentListener  *listener,
+         DEBUG("%s: %s", *p, polkit_details_lookup(details, *p));
+ #endif
+     data->listener = (LXPolkitListener*)listener;
+-    data->result = g_simple_async_result_new(listener, callback, user_data, initiate_authentication);
++    data->result = g_simple_async_result_new(G_OBJECT(listener), callback, user_data, initiate_authentication);
+ 
+     data->action_id = g_strdup(action_id);
+     data->cancellable = (GCancellable*)g_object_ref(cancellable);
+@@ -260,10 +260,10 @@ static void initiate_authentication(PolkitAgentListener  *listener,
+                 g_free(str);
+             }
+         }
+-        gtk_combo_box_set_model(data->id, GTK_TREE_MODEL(store));
++        gtk_combo_box_set_model(GTK_COMBO_BOX(data->id), GTK_TREE_MODEL(store));
+         g_object_unref(store);
+         /* select the fist user in the list */
+-        gtk_combo_box_set_active(data->id, 0);
++        gtk_combo_box_set_active(GTK_COMBO_BOX(data->id), 0);
+     }
+     else
+     {
diff --git a/system/lxsession/lxsession.SlackBuild b/system/lxsession/lxsession.SlackBuild
index f900a0f37c2..16ca1227b86 100644
--- a/system/lxsession/lxsession.SlackBuild
+++ b/system/lxsession/lxsession.SlackBuild
@@ -73,8 +73,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=lxsession
-VERSION=${VERSION:-0.5.5}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-20240415_f68f477}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -129,8 +129,9 @@ 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 {} \;
 
-rm *.stamp
-autoreconf -fi
+patch -p1 < $CWD/gcc14.patch
+
+./autogen.sh || true
 
 CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
diff --git a/system/lxsession/lxsession.info b/system/lxsession/lxsession.info
index 116fd62cded..b773231844a 100644
--- a/system/lxsession/lxsession.info
+++ b/system/lxsession/lxsession.info
@@ -1,8 +1,8 @@
 PRGNAM="lxsession"
-VERSION="0.5.5"
+VERSION="20240415_f68f477"
 HOMEPAGE="https://wiki.lxde.org/en/LXSession"
-DOWNLOAD="https://downloads.sf.net/lxde/lxsession-0.5.5.tar.xz"
-MD5SUM="e8380acef215ee7c99c067a2241c2c7b"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/lxsession-20240415_f68f477.tar.xz"
+MD5SUM="4903b76d535be464c20e57e7a5aea6c1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libunique3"
diff --git a/system/lxterminal/gcc14.patch b/system/lxterminal/gcc14.patch
new file mode 100644
index 00000000000..5eecd92e748
--- /dev/null
+++ b/system/lxterminal/gcc14.patch
@@ -0,0 +1,49 @@
+From c947b9065b470c24064ac1b1c4935e8093970531 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA 
+Date: Wed, 21 Feb 2024 17:01:14 +0900
+Subject: [PATCH] Fix: support gcc14 -Werror=incompatible-pointer-types
+
+gcc14 now defaults to -Werror=incompatible-pointer-types .
+Fix code to support this.
+
+* Add GTK cast for GTK_STYLE_PROVIDER
+* VteRegex must be deref'ed with vte_regex_unref
+
+Fixes #121 .
+---
+ src/lxterminal.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/lxterminal.c b/src/lxterminal.c
+index 680e411..dcd7405 100644
+--- a/src/lxterminal.c
++++ b/src/lxterminal.c
+@@ -1208,7 +1208,7 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch
+     GtkStyleContext* box_style_ctx =
+         gtk_widget_get_style_context(GTK_WIDGET(terminal->box));
+     gtk_style_context_add_provider(
+-        box_style_ctx, box_css_provider,
++        box_style_ctx, GTK_STYLE_PROVIDER(box_css_provider),
+         GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+     #endif
+ 
+@@ -1232,6 +1232,8 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch
+     vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer");
+     ret = vte_terminal_match_add_regex(VTE_TERMINAL(term->vte), dingus2, 0);
+     vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer");
++    vte_regex_unref(dingus1);
++    vte_regex_unref(dingus2);
+ #else
+     GRegex * dingus1 = g_regex_new(DINGUS1, G_REGEX_OPTIMIZE, 0, NULL);
+     GRegex * dingus2 = g_regex_new(DINGUS2, G_REGEX_OPTIMIZE, 0, NULL);
+@@ -1239,9 +1241,9 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch
+     vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer");
+     ret = vte_terminal_match_add_gregex(VTE_TERMINAL(term->vte), dingus2, 0);
+     vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer");
+-#endif
+     g_regex_unref(dingus1);
+     g_regex_unref(dingus2);
++#endif
+ 
+     /* Create a horizontal box inside an event box as the toplevel for the tab label. */
+     term->tab = gtk_event_box_new();
diff --git a/system/lxterminal/lxterminal.SlackBuild b/system/lxterminal/lxterminal.SlackBuild
index 6f4515229e5..4a04a1d835b 100644
--- a/system/lxterminal/lxterminal.SlackBuild
+++ b/system/lxterminal/lxterminal.SlackBuild
@@ -71,6 +71,8 @@
 #             * Update.
 # 0.4.0-2:    24/apr/2024 by Matteo Bernardini 
 #             * Switch to gtk+3.
+# 20230917_9b4299c: 15/may/2024 by Matteo Bernardini 
+#             * Fix building with gcc14.
 #
 # Run 'sh lxterminal.SlackBuild' to build a Slackware package.
 # The package is created in /tmp .
@@ -81,8 +83,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=lxterminal
-VERSION=${VERSION:-0.4.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-20230917_9b4299c}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -136,6 +138,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/gcc14.patch
+
 sh autogen.sh || true
 
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/system/lxterminal/lxterminal.info b/system/lxterminal/lxterminal.info
index d8fecdbf39f..b724fc5081e 100644
--- a/system/lxterminal/lxterminal.info
+++ b/system/lxterminal/lxterminal.info
@@ -1,8 +1,8 @@
 PRGNAM="lxterminal"
-VERSION="0.4.0"
+VERSION="20230917_9b4299c"
 HOMEPAGE="https://wiki.lxde.org/en/LXTerminal"
-DOWNLOAD="http://downloads.sf.net/lxde/lxterminal-0.4.0.tar.xz"
-MD5SUM="7938dbd50e3826c11f4735a742b278d3"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/lxterminal-20230917_9b4299c.tar.xz"
+MD5SUM="d10f0f84b2a5c44eaa338d3b6cf6cfdb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/macemu/macemu.SlackBuild b/system/macemu/macemu.SlackBuild
index f74e71ea012..f21787f4c8c 100644
--- a/system/macemu/macemu.SlackBuild
+++ b/system/macemu/macemu.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=macemu
-VERSION=${VERSION:-20180225_2e302d6}
+VERSION=${VERSION:-20240822_e517d73}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -84,6 +84,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 {} \;
 
+# https://github.com/kanjitalk755/macemu
+
 # Build BasiliskII
 cd $PRGNAM1/src/Unix
 
@@ -109,9 +111,10 @@ make
 make install DESTDIR=$PKG
 cd -
 
-# SheepShaver is built with jit disabled by default on x86_64
-# or we get a relocation error
-if [ "$ARCH" = "x86_64" ]; then jit="no"; else jit="yes"; fi
+# maybe not needed anymore?
+## SheepShaver is built with jit disabled by default on x86_64
+## or we get a relocation error
+#if [ "$ARCH" = "x86_64" ]; then jit="no"; else jit="yes"; fi
 
 cd $PRGNAM2/src/Unix
 
@@ -122,7 +125,7 @@ CXXFLAGS="$SLKCFLAGS -Wno-narrowing" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
-  --enable-jit=$jit \
+  --enable-jit=yes \
   --disable-vosf \
   --enable-sdl-audio=yes \
   --enable-sdl-video=yes \
diff --git a/system/macemu/macemu.info b/system/macemu/macemu.info
index 21b35c45fd2..705df65e935 100644
--- a/system/macemu/macemu.info
+++ b/system/macemu/macemu.info
@@ -1,8 +1,8 @@
 PRGNAM="macemu"
-VERSION="20180225_2e302d6"
+VERSION="20240822_e517d73"
 HOMEPAGE="https://basilisk.cebix.net"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/macemu-20180225_2e302d6.tar.xz"
-MD5SUM="e8b58eca8debd68d03b05b34110e070d"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/macemu-20240822_e517d73.tar.xz"
+MD5SUM="538e4354c0ccddfc9fc828f9c18f5973"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/nut/README b/system/nut/README
deleted file mode 100644
index bf5ba069e10..00000000000
--- a/system/nut/README
+++ /dev/null
@@ -1,8 +0,0 @@
-The Network UPS Tools is a collection of programs which provide a
-common interface for monitoring and administering UPS hardware. It
-uses a layered apporoach to connect all the components. Drivers are
-provided for a wide assortment of equipment. The primary goal of the
-NUT project is to provide reliable monitoring of UPS hardware and
-ensure safe shutdowns of the systems which are connected.
-
-See README.SLACKWARE for configuration hints.
diff --git a/system/nut/README.SLACKWARE b/system/nut/README.SLACKWARE
deleted file mode 100644
index a73275956cc..00000000000
--- a/system/nut/README.SLACKWARE
+++ /dev/null
@@ -1,43 +0,0 @@
-README.SLACKWARE
-Written by V'yacheslav Stetskevych 
-
-In order to configure Network UPS tools on Slackware you need to rename
-or make copies of the sample config files in /etc/nut and edit them
-to suit your needs.  See documentation in /usr/doc/nut-* for reference.
-As you make your new config files, don't forget to secure them:
-	chown root:nut /etc/nut/*.conf /etc/nut/*.users
-	chmod 640 /etc/nut/*.conf /etc/nut/*.users
-
-If you are using a serial-connected UPS, be sure to add the nut user to
-the 'dialout' group:
-	usermod -a -G dialout nut
-
-A startup script /etc/rc.d/rc.ups is provided with this build.
-You can add these lines to /etc/rc.d/rc.local to launch it on system start:
-	if [ -x /etc/rc.d/rc.ups ]; then
-		/etc/rc.d/rc.ups start
-	fi
-
-If you have more than one box sitting on the same UPS, you should only use
-'start' on the one box that is connected to the device using a signal cable.
-On the other boxes, start rc.ups with the 'start_upsmon' parameter to only
-monitor the power status (client mode). Configure access permissions on the
-server box accordingly.
-
-If you wish for your UPS to turn off it's power during an extended power outage
-in order not to drain it's battery completely, you should make two simple edits
-to the Slackware shutdown script /etc/rc.d/rc.6 near the end of it.
-These are only needed on the server box, one that is connected to the UPS:
-1) Insert after the rootfs has been remounted read-only:
-	if [ -x /usr/libexec/nut/nut_restart_udev ]; then
-		. /usr/libexec/nut/nut_restart_udev
-	fi
-2) Insert after the genpowerd block and before the actual halt:
-	if [ -x /usr/libexec/nut/nut_kill_inverter ]; then
-		. /usr/libexec/nut/nut_kill_inverter
-	fi
-
-Don't forget to set your motherboard BIOS to automatically turn the machine on
-when the power comes back.
-
-Have fun!
diff --git a/system/nut/doinst.sh b/system/nut/doinst.sh
deleted file mode 100644
index ea64d25add0..00000000000
--- a/system/nut/doinst.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-config() {
-	NEW="$1"
-	OLD="$(dirname $NEW)/$(basename $NEW .new)"
-	# If there's no config file by that name, mv it over:
-	if [ ! -r $OLD ]; then
-		mv $NEW $OLD
-	elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-		# toss the redundant copy
-		rm $NEW
-	fi
-	# Otherwise, we leave the .new copy for the admin to consider...
-}
-
-# Keep same perms on rc.ups.new:
-if [ -e etc/rc.d/rc.ups ]; then
-	cp -a etc/rc.d/rc.ups etc/rc.d/rc.ups.new.incoming
-	cat etc/rc.d/rc.ups.new > etc/rc.d/rc.ups.new.incoming
-	mv etc/rc.d/rc.ups.new.incoming etc/rc.d/rc.ups.new
-fi
-
-config etc/rc.d/rc.ups.new
diff --git a/system/nut/nut.SlackBuild b/system/nut/nut.SlackBuild
deleted file mode 100644
index d4b19e36eec..00000000000
--- a/system/nut/nut.SlackBuild
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for nut (Network UPS Tools)
-
-# Copyright 2010 V'yacheslav Stetskevych 
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=nut
-VERSION=${VERSION:-2.7.4}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-NUTUSER=${NUTUSER:-nut}
-NUTGROUP=${NUTGROUP:-nut}
-
-# The user and group accounts have to be created manually.
-# For slackbuilds.org, assigned nut uid/gid are 218/218.
-# See http://slackbuilds.org/uid_gid.txt
-if ! grep -q ^$NUTGROUP: /etc/group; then
-	echo "  You must have a \"$NUTGROUP\" group to run this script."
-	echo "    # groupadd -g 218 $NUTGROUP"
-	exit 1
-elif ! grep -q ^$NUTUSER: /etc/passwd; then
-	echo "  You must have a \"$NUTUSER\" user to run this script."
-	echo "    # useradd -u 218 -g $NUTGROUP -s /bin/false $NUTUSER"
-	exit 1
-fi
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -std=c++14" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc/$PRGNAM \
-  --localstatedir=/var \
-  --datadir=/usr/share/nut \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux \
-  --enable-strip \
-  --disable-static \
-  --with-dev \
-  --with-serial \
-  --with-usb \
-  --with-snmp \
-  --with-neon \
-  --with-wrap \
-  --with-cgi\
-  --with-cgipath=/var/www/cgi-bin/nut \
-  --with-htmlpath=/var/www/htdocs/ups \
-  --with-drvpath=/usr/libexec/nut \
-  --with-statepath=/var/run/nut \
-  --with-pidpath=/var/run/nut \
-  --with-altpidpath=/var/run/nut \
-  --with-user=nut \
-  --with-group=nut
-make
-make install DESTDIR=$PKG
-
-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
-
-# Install the bash_completion script
-install -d $PKG/usr/share/bash-completion/completions
-install -m 755 scripts/misc/nut.bash_completion $PKG/usr/share/bash-completion/completions/nut
-
-# Install the startup script
-install -d $PKG/etc/rc.d
-install -m 644 $CWD/rc.ups $PKG/etc/rc.d/rc.ups.new
-
-# Create the state and run dirs
-install -d -o root -g $NUTGROUP -m 770 $PKG/var/state/ups
-install -d -o $NUTUSER -g $NUTGROUP -m 770 $PKG/var/run/nut
-
-# Install shutdown helper files
-install -m 755 $CWD/nut_restart_udev $CWD/nut_kill_inverter $PKG/usr/libexec/nut
-
-# Install documentation
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -ar docs \
-  AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README UPGRADING \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-rm $PKG/usr/doc/$PRGNAM-$VERSION/docs/Makefile*
-cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-rm -f $PKG/usr/lib*/*.la
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/nut/nut.info b/system/nut/nut.info
deleted file mode 100644
index b6e4db3b0c8..00000000000
--- a/system/nut/nut.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="nut"
-VERSION="2.7.4"
-HOMEPAGE="http://www.networkupstools.org/"
-DOWNLOAD="http://www.networkupstools.org/source/2.7/nut-2.7.4.tar.gz"
-MD5SUM="3ba53656933d7471f95140b32a5b8d5c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="V'yacheslav Stetskevych"
-EMAIL="slava18@gmail.com"
diff --git a/system/nut/nut_kill_inverter b/system/nut/nut_kill_inverter
deleted file mode 100644
index 251a047df7b..00000000000
--- a/system/nut/nut_kill_inverter
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# This file is part of Network UPS Tools build for Slackware Linux.
-# It should be sourced in /etc/rc.d/rc.0 as part of the poweroff sequence.
-# Here, we signal the UPS to shut off the power.
-# Reference: http://www.mail-archive.com/nut-upsdev@lists.alioth.debian.org/msg01099.html
-# To be sourced after the genpowerd block and before the actual halt.
-
-if [ -f /etc/killpower ]; then
-	echo "----------------------------------------Shutting down UPS power!"
-	/etc/rc.d/rc.ups shutdown
-	sleep 40
-	echo "The UPS was not shut off properly, or the power came back in the"
-	echo "middle of the shutdown process, or USB communication failed."
-	sleep 10
-fi
diff --git a/system/nut/nut_restart_udev b/system/nut/nut_restart_udev
deleted file mode 100644
index d289c0f87a4..00000000000
--- a/system/nut/nut_restart_udev
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# This file is part of Network UPS Tools build for Slackware Linux.
-# It should be sourced in /etc/rc.d/rc.0 as part of the poweroff sequence.
-# Here, we restart udev so that the system is able to kill off the UPS inverter.
-# Reference: http://www.mail-archive.com/nut-upsdev@lists.alioth.debian.org/msg01099.html
-# To be sourced after the rootfs has been remounted read-only.
-
-if [ -f /etc/killpower ]; then
-echo "Restarting udev to be able to shut the UPS inverter off..."
-/etc/rc.d/rc.udev start
-sleep 10
-fi
diff --git a/system/nut/rc.ups b/system/nut/rc.ups
deleted file mode 100644
index 37916951bd9..00000000000
--- a/system/nut/rc.ups
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-# Slackware startup script for Network UPS Tools
-# Copyright 2010 V'yacheslav Stetskevych
-
-# UPS drivers live here
-DRIVERPATH=/usr/libexec/nut
-export PATH=$DRIVERPATH:$PATH
-
-POWERDOWNFLAG=/etc/killpower
-NUTUSER=nut
-NUTGROUP=nut
-UPSDCONF=/etc/ups/upsd.conf
-UPSCONF=/etc/ups/ups.conf
-UPSMONCONF=/etc/ups/upsmon.conf
-
-# Check for existense of the nut user and group
-# For slackbuilds.org, assigned nut uid/gid are 218/218.
-# See http://slackbuilds.org/uid_gid.txt
-if ! grep -q ^$NUTGROUP: /etc/group; then
-	echo "  You must have a \"$NUTGROUP\" group to run this script."
-	echo "    # groupadd -g 218 $NUTGROUP"
-	exit 1
-elif ! grep -q ^$NUTUSER: /etc/passwd; then
-	echo "  You must have a \"$NUTUSER\" user to run this script."
-	echo "    # useradd -u 218 -g $NUTGROUP -s /bin/false $NUTUSER"
-	exit 1
-fi
-
-start_driver() {
-	upsdrvctl -u $NUTUSER start || exit 1
-}
-
-start_upsd() {
-	upsd -u $NUTUSER || exit 1
-}
-
-start_upsmon() {
-	upsmon -u $NUTUSER || exit 1
-}
-
-stop() {
-	echo "Stopping the UPS services... "
-	if pgrep upsd 2>&1 >/dev/null; then
-		upsd -c stop; fi
-	if pgrep upsmon 2>&1 >/dev/null; then
-		upsmon -c stop; fi
-	upsdrvctl stop
-}
-
-case "$1" in
-	start)	# starts everything (for a ups server box)
-		mkdir -p /var/run/nut
-		chown $NUTUSER:$NUTGROUP /var/run/nut
-		chmod 0770 /var/run/nut
-		start_driver
-		start_upsd
-		start_upsmon
-		;;
-	start_upsmon) # starts upsmon only (for a ups client box)
-		start_upsmon
-		;;
-	stop) # stops all UPS-related daemons
-		stop	
-		;;
-	shutdown) # shuts down the UPS
-		echo "Killing inverter..."
-		upsdrvctl shutdown
-		;;
-	reload)
-		echo "Reloading config files..."
-		upsd -c reload
-		upsmon -c reload
-		;;
-	*)
-		echo "Usage: $0 {start|start_upsmon|stop|shutdown|reload}"
-esac
diff --git a/system/nut/slack-desc b/system/nut/slack-desc
deleted file mode 100644
index c4c8a99c238..00000000000
--- a/system/nut/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------------------------------------------------------|
-nut: nut (Network UPS Tools)
-nut:
-nut: The Network UPS Tools is a collection of programs which provide a
-nut: common interface for monitoring and administering UPS hardware.
-nut: It uses a layered apporoach to connect all the components. Drivers
-nut: are provided for a wide assortment of equipment. The primary goal of
-nut: the NUT project is to provide reliable monitoring of UPS hardware
-nut: and ensure safe shutdowns of the systems which are connected.
-nut:
-nut: Homepage: http://www.networkupstools.org
-nut:
diff --git a/system/nvidia-firmware/README b/system/nvidia-firmware/README
deleted file mode 100644
index ba64cbc845a..00000000000
--- a/system/nvidia-firmware/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This is the proprietary firmware extracted from the NVIDIA binary driver
-needed by nouveau for video decoding.
-
-See the documentation at freedesktop.org to see if your hardware is
-supported or not. One way to find out which chip you have is by running:
-
-  lspci -nn -d 10de:
diff --git a/system/nvidia-firmware/nvidia-firmware.SlackBuild b/system/nvidia-firmware/nvidia-firmware.SlackBuild
deleted file mode 100644
index 95d6a9a646b..00000000000
--- a/system/nvidia-firmware/nvidia-firmware.SlackBuild
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for nvidia-firmware
-
-# Copyright 2015, 2018 Hunter Sezen California, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=nvidia-firmware
-VERSION=${VERSION:-325.15}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-ARCH=noarch
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-SRC=$TMP/$PRGNAM-$VERSION
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -eu
-
-rm -rf $PKG $SRC
-mkdir -p $TMP $SRC $PKG $OUTPUT
-cd $SRC
-sh $CWD/NVIDIA-Linux-x86-$VERSION.run --extract-only
-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 {} \;
-
-python $CWD/extract_firmware.py
-
-mkdir -p $PKG/lib/firmware/nouveau/
-cp -av nv* vuc-* $PKG/lib/firmware/nouveau/
-
-mkdir -p $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
diff --git a/system/nvidia-firmware/nvidia-firmware.info b/system/nvidia-firmware/nvidia-firmware.info
deleted file mode 100644
index 2e848a4635c..00000000000
--- a/system/nvidia-firmware/nvidia-firmware.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="nvidia-firmware"
-VERSION="325.15"
-HOMEPAGE="https://wiki.freedesktop.org/nouveau/VideoAcceleration/"
-DOWNLOAD="http://us.download.nvidia.com/XFree86/Linux-x86/325.15/NVIDIA-Linux-x86-325.15.run \
-          https://raw.githubusercontent.com/imirkin/re-vp2/d19d818d1e05c7c68afb052073cc8a487cac8f5d/extract_firmware.py"
-MD5SUM="528fc538584de6446384b9cec3099d6c \
-        7975d50a07d9cd9131dba60aef32a86f"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
diff --git a/system/nvidia-firmware/slack-desc b/system/nvidia-firmware/slack-desc
deleted file mode 100644
index 6632852ec0c..00000000000
--- a/system/nvidia-firmware/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------------------------------------------------------|
-nvidia-firmware: nvidia-firmware (video firmware for nouveau)
-nvidia-firmware:
-nvidia-firmware: This is the proprietary firmware extracted from the NVIDIA
-nvidia-firmware: binary driver needed by nouveau for video decoding.
-nvidia-firmware:
-nvidia-firmware:
-nvidia-firmware:
-nvidia-firmware:
-nvidia-firmware:
-nvidia-firmware:
-nvidia-firmware:
diff --git a/system/osinfo-db-tools/libxml-2.12.patch b/system/osinfo-db-tools/libxml-2.12.patch
new file mode 100644
index 00000000000..af42e412294
--- /dev/null
+++ b/system/osinfo-db-tools/libxml-2.12.patch
@@ -0,0 +1,85 @@
+From 34378a4ac257f2f5fcf364786d1634a8c36b304f Mon Sep 17 00:00:00 2001
+From: Michal Privoznik 
+Date: Mon, 27 Nov 2023 15:04:43 +0100
+Subject: [PATCH 1/2] Make xmlError structs constant
+
+In libxml2 commits v2.12.0~14 and v2.12.0~77 the API changed so
+that:
+
+1) xmlGetLastError() returns pointer to a constant xmlError
+   struct, and
+
+2) xmlSetStructuredErrorFunc() changed the signature of callback
+   (validate_structured_error_nop()), it too is passed pointer to
+   a constant xmlError struct.
+
+But of course, older libxml2 expects different callback
+signature. Therefore, we need to typecast it anyway.
+
+Also, drop obviously incorrect @error annotation in
+validate_structured_error_nop; the variable is used.
+
+Signed-off-by: Michal Privoznik 
+---
+ tools/osinfo-db-validate.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c
+index a721b4d..b1434a6 100644
+--- a/tools/osinfo-db-validate.c
++++ b/tools/osinfo-db-validate.c
+@@ -35,7 +35,7 @@ static void validate_generic_error_nop(void *userData G_GNUC_UNUSED,
+ }
+ 
+ static void validate_structured_error_nop(void *userData G_GNUC_UNUSED,
+-                                          xmlErrorPtr error G_GNUC_UNUSED)
++                                          const xmlError *error)
+ {
+     if (error->file)
+         g_printerr("%s:%d %s", error->file, error->line, error->message);
+@@ -173,7 +173,8 @@ static gboolean validate_files(GFile *schema, gsize nfiles, GFile **files, GErro
+     g_autofree gchar *schemapath = NULL;
+ 
+     xmlSetGenericErrorFunc(NULL, validate_generic_error_nop);
+-    xmlSetStructuredErrorFunc(NULL, validate_structured_error_nop);
++    /* Drop this typecast when >=libxml2-2.12.0 is required */
++    xmlSetStructuredErrorFunc(NULL, (xmlStructuredErrorFunc) validate_structured_error_nop);
+ 
+     schemapath = g_file_get_path(schema);
+     rngParser = xmlRelaxNGNewParserCtxt(schemapath);
+-- 
+GitLab
+
+
+From 019487cbc79925e49988789bf533c78dab7e1842 Mon Sep 17 00:00:00 2001
+From: Michal Privoznik 
+Date: Mon, 27 Nov 2023 15:06:04 +0100
+Subject: [PATCH 2/2] osinfo-db-validate: Add more libxml/ includes
+
+In its 2.12.0 release, libxml reworked their header files (some
+might even call it cleaning up, I call it API incompatible
+change) and now  we don't get all declarations we need by just
+including one file. Add missing includes.
+
+Signed-off-by: Michal Privoznik 
+---
+ tools/osinfo-db-validate.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c
+index b1434a6..f3275db 100644
+--- a/tools/osinfo-db-validate.c
++++ b/tools/osinfo-db-validate.c
+@@ -20,7 +20,9 @@
+  *   Daniel P. Berrange 
+  */
+ 
++#include 
+ #include 
++#include 
+ #include 
+ #include 
+ 
+-- 
+GitLab
+
diff --git a/system/osinfo-db-tools/osinfo-db-tools.SlackBuild b/system/osinfo-db-tools/osinfo-db-tools.SlackBuild
index c689e311563..368b4424a62 100644
--- a/system/osinfo-db-tools/osinfo-db-tools.SlackBuild
+++ b/system/osinfo-db-tools/osinfo-db-tools.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for osinfo-db-tools
 
-# Copyright 2016-2023 Matteo Bernardini , Pisa, Italy
+# Copyright 2016-2024 Matteo Bernardini , Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=osinfo-db-tools
-VERSION=${VERSION:-1.10.0}
+VERSION=${VERSION:-1.11.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -81,6 +81,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+patch -p1 < $CWD/libxml-2.12.patch
+
 mkdir build
 cd build
   CFLAGS="$SLKCFLAGS" \
diff --git a/system/osinfo-db-tools/osinfo-db-tools.info b/system/osinfo-db-tools/osinfo-db-tools.info
index ad699ecdc15..99dae01bac8 100644
--- a/system/osinfo-db-tools/osinfo-db-tools.info
+++ b/system/osinfo-db-tools/osinfo-db-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="osinfo-db-tools"
-VERSION="1.10.0"
+VERSION="1.11.0"
 HOMEPAGE="http://libosinfo.org"
-DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-tools-1.10.0.tar.xz"
-MD5SUM="f0c83772ce612b5d0befb77a8d6f309b"
+DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-tools-1.11.0.tar.xz"
+MD5SUM="8fed1cfc692b6fa1a80f002b0a8447ac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/osinfo-db/osinfo-db.SlackBuild b/system/osinfo-db/osinfo-db.SlackBuild
index f1d803ad2f4..26b075d626f 100644
--- a/system/osinfo-db/osinfo-db.SlackBuild
+++ b/system/osinfo-db/osinfo-db.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for osinfo-db
 
-# Copyright 2016-2023 Matteo Bernardini , Pisa, Italy
+# Copyright 2016-2024 Matteo Bernardini , Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=osinfo-db
-VERSION=${VERSION:-20230308}
+VERSION=${VERSION:-20240701}
 SLVERSION=${SLVERSION:-20220214}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
diff --git a/system/osinfo-db/osinfo-db.info b/system/osinfo-db/osinfo-db.info
index c61d3a665ef..b6c6157874f 100644
--- a/system/osinfo-db/osinfo-db.info
+++ b/system/osinfo-db/osinfo-db.info
@@ -1,9 +1,9 @@
 PRGNAM="osinfo-db"
-VERSION="20230308"
+VERSION="20240701"
 HOMEPAGE="http://libosinfo.org"
-DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-20230308.tar.xz \
+DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-20240701.tar.xz \
           https://harrier.slackbuilds.org/misc/osinfo-db-slackware-20220214.tar.xz"
-MD5SUM="0293bded4e2b7b22fe87bd629d2b71ce \
+MD5SUM="584f2639544f210012e0c9e6e87feeff \
         65ed4d991bdab6ab00bc34bcbb5d16ff"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/system/pcem/pcem.SlackBuild b/system/pcem/pcem.SlackBuild
index 36d31c9abab..6f108341a1b 100644
--- a/system/pcem/pcem.SlackBuild
+++ b/system/pcem/pcem.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pcem
 
-# Copyright 2022-2023 K. Eugene Carlson  Tsukuba, Japan
+# Copyright 2022-2024 K. Eugene Carlson  Tsukuba, Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PRGNAM=pcem
 VERSION=${VERSION:-b8ad941.20230304}
 SRCVERSION=${SRCVERSION:-b8ad9416bc1d3acd8b384a83b753ddf2282bd091}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -99,6 +99,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Fix 32-bit build
+zcat $CWD/x86-build.diff.gz | patch -p0
+
 mkdir build
 cd build
 cmake -G "Ninja" \
diff --git a/system/pcem/x86-build.diff.gz b/system/pcem/x86-build.diff.gz
new file mode 100644
index 00000000000..5e6a8c49a79
Binary files /dev/null and b/system/pcem/x86-build.diff.gz differ
diff --git a/system/pcmanfm/pcmanfm.SlackBuild b/system/pcmanfm/pcmanfm.SlackBuild
index 852d5f2cae1..b599e98d70f 100644
--- a/system/pcmanfm/pcmanfm.SlackBuild
+++ b/system/pcmanfm/pcmanfm.SlackBuild
@@ -31,8 +31,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=pcmanfm
-VERSION=${VERSION:-1.3.2}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-20230917_e6b422b}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -88,7 +88,7 @@ find -L . \
 
 sh autogen.sh || true
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fpermissive" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/system/pcmanfm/pcmanfm.info b/system/pcmanfm/pcmanfm.info
index d3546b675e0..0a347feab9b 100644
--- a/system/pcmanfm/pcmanfm.info
+++ b/system/pcmanfm/pcmanfm.info
@@ -1,8 +1,8 @@
 PRGNAM="pcmanfm"
-VERSION="1.3.2"
+VERSION="20230917_e6b422b"
 HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-DOWNLOAD="https://downloads.sf.net/pcmanfm/pcmanfm-1.3.2.tar.xz"
-MD5SUM="ef7c4417d2697ef138d175db7aeae15a"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/pcmanfm-20230917_e6b422b.tar.xz"
+MD5SUM="8b263571312ea14fde719831f61b8be1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libfm"
diff --git a/system/qemu/README b/system/qemu/README
index db15c434e25..115cf21fb8e 100644
--- a/system/qemu/README
+++ b/system/qemu/README
@@ -41,15 +41,17 @@ your processor) prior to launching qemu-system-ARCH with kvm enabled.
 For older/unmaintained qemu frontends, this build also creates a
 symlink to qemu-system-ARCH at /usr/bin/qemu-kvm.
 
-libiscsi (to access iSCSI targets directly), libslirp (user mode
-networking), libcacard, spice, usbredir, virglrenderer, libnfs, snappy,
-glusterfs, and vde2, numactl. sphinx-rtd-theme and Sphinx (to build
-documentation) are optional dependencies that will be automatically
-detected during compilation, if present (all avialable on SBo).
+libiscsi (to access iSCSI targets directly), libslirp, libcacard, spice
+usbredir, virglrenderer, libnfs, snappy, glusterfs, and vde2, numactl,
+sphinx-rtd-theme and Sphinx (to build documentation) are optional
+dependencies that will be automatically detected during compilation, if
+present (all available on SBo).
 
-To enable user mode networking, install libslirp, then compile qemu:
+To disable user mode networking compile qemu with:
 
-SLIRP=yes ./qemu.SlackBuild
+  SLIRP=no ./qemu.SlackBuild
+
+The dependency virtiofsd isn't usable on a 32bit operating system.
 
 NOTES:
   This version breaks some backward compatibility with earlier versions.
diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild
index 559ba52634d..093b192f304 100644
--- a/system/qemu/qemu.SlackBuild
+++ b/system/qemu/qemu.SlackBuild
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=qemu
-VERSION=${VERSION:-9.0.2}
+VERSION=${VERSION:-9.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -113,10 +113,10 @@ else
 fi
 
 # To enable user mode networking use SLIRP=yes
-if [ "$SLIRP" = "yes" ]; then
-  with_slirp="--enable-slirp"
+if [ "$SLIRP" = "no" ]; then
+  with_slirp="--disable-slirp"
 else
-  with_slirp=""
+  with_slirp="--enable-slirp"
 fi
 
 CFLAGS="$SLKCFLAGS" \
diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info
index 6b13714af62..168c08ac6e7 100644
--- a/system/qemu/qemu.info
+++ b/system/qemu/qemu.info
@@ -1,10 +1,10 @@
 PRGNAM="qemu"
-VERSION="9.0.2"
+VERSION="9.1.2"
 HOMEPAGE="https://www.qemu.org"
-DOWNLOAD="https://download.qemu.org/qemu-9.0.2.tar.xz"
-MD5SUM="f7f0462262d2571f146c6a8adda33b29"
+DOWNLOAD="https://download.qemu.org/qemu-9.1.2.tar.xz"
+MD5SUM="ea4bb735d60ad3392875f7cd48e551af"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="device-tree-compiler python3-meson-opt"
+REQUIRES="device-tree-compiler libslirp python3-meson-opt virtiofsd"
 MAINTAINER="Edward W. Koenig"
 EMAIL="kingbeowulf@linuxgalaxy.org"
diff --git a/system/scdoc/README b/system/scdoc/README
deleted file mode 100644
index 3c4b288e250..00000000000
--- a/system/scdoc/README
+++ /dev/null
@@ -1,3 +0,0 @@
-scdoc is a simple man page generator for POSIX systems written in C99.
-
-It requires the input files to be UTF-8 encoded.
diff --git a/system/scdoc/scdoc.SlackBuild b/system/scdoc/scdoc.SlackBuild
deleted file mode 100644
index 88098462e27..00000000000
--- a/system/scdoc/scdoc.SlackBuild
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for scdoc
-
-# Copyright 2021 Manuel Argüelles Panama City, Panama
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=scdoc
-VERSION=${VERSION:-1.11.2}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-PREFIX=/usr \
-make
-make install DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man
-
-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
-
-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 \
-  COPYING \
-  README.md \
-  $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
diff --git a/system/scdoc/scdoc.info b/system/scdoc/scdoc.info
deleted file mode 100644
index b5bfd41e34c..00000000000
--- a/system/scdoc/scdoc.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="scdoc"
-VERSION="1.11.2"
-HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
-DOWNLOAD="https://git.sr.ht/~sircmpwn/scdoc/archive/1.11.2.tar.gz"
-MD5SUM="0f6e8b9bb741f52d975081784757078b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Manuel Argüelles"
-EMAIL="manuel.arguelles@gmail.com"
diff --git a/system/scdoc/slack-desc b/system/scdoc/slack-desc
deleted file mode 100644
index 1f56aa5e397..00000000000
--- a/system/scdoc/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------------------------------------------------------|
-scdoc: scdoc (small man page generator)
-scdoc:
-scdoc: Simple man page generator for POSIX systems written in C99.
-scdoc:
-scdoc:
-scdoc:
-scdoc:
-scdoc:
-scdoc:
-scdoc:
-scdoc:
diff --git a/system/schedtool/schedtool-1.3.0-c99.patch b/system/schedtool/schedtool-1.3.0-c99.patch
new file mode 100644
index 00000000000..8f3c0b33afc
--- /dev/null
+++ b/system/schedtool/schedtool-1.3.0-c99.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/918974
+https://src.fedoraproject.org/rpms/schedtool/c/f84b6a0fdc4b368e2b1c5ea59739f002063e3c9e?branch=rawhide
+
+Invoke decode_error separately with the correct argument types for
+each variant.  This avoids an int-conversion error.
+
+--- a/schedtool.c
++++ b/schedtool.c
+@@ -422,19 +422,14 @@ int set_process(pid_t pid, int policy, int prio)
+ 	struct sched_param p;
+ 	int ret;
+ 
+-	char *msg1="could not set PID %d to %s";
+-	char *msg2="could not set PID %d to raw policy #%d";
+-
+ 	p.sched_priority=prio;
+ 
+ 	/* anything other than 0 indicates error */
+ 	if((ret=sched_setscheduler(pid, policy, &p))) {
+-
+-                /* la la pointer mismatch .. lala */
+-		decode_error((CHECK_RANGE_POLICY(policy) ? msg1 : msg2),
+-			     pid,
+-			     (CHECK_RANGE_POLICY(policy) ? TAB[policy] : policy)
+-			    );
++		if (CHECK_RANGE_POLICY(policy))
++			decode_error("could not set PID %d to %s", pid, TAB[policy]);
++		else
++			decode_error("could not set PID %d to raw policy #%d", pid, policy);
+ 		return(ret);
+ 	}
+ 	return(0);
+
diff --git a/system/schedtool/schedtool.SlackBuild b/system/schedtool/schedtool.SlackBuild
index e3b9e2cf608..793a21a6802 100644
--- a/system/schedtool/schedtool.SlackBuild
+++ b/system/schedtool/schedtool.SlackBuild
@@ -56,6 +56,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch -p1 < $CWD/schedtool-1.3.0-c99.patch
 patch -p1 < $CWD/schedtool-Makefile.patch
 
 make install \
diff --git a/system/seahorse/patches/GnuPG-2.4.patch b/system/seahorse/patches/GnuPG-2.4.patch
new file mode 100644
index 00000000000..0289bcd375d
--- /dev/null
+++ b/system/seahorse/patches/GnuPG-2.4.patch
@@ -0,0 +1,25 @@
+From 9260c74779be3d7a378db0671af862ffa3573d42 Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao 
+Date: Wed, 21 Dec 2022 20:58:26 +0800
+Subject: [PATCH] Allow building with GnuPG-2.4.x
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index e29b5322..23d0b54f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -26,7 +26,7 @@ endif
+ # Dependencies
+ min_glib_version = '2.66'
+ min_gcr_version = '3.38'
+-accepted_gpg_versions = [ '2.2.0', '2.3.0' ]
++accepted_gpg_versions = [ '2.2.0', '2.3.0', '2.4.0' ]
+ gpg_check_version = find_program('build-aux' / 'gpg_check_version.py')
+ 
+ glib_deps = [
+-- 
+GitLab
+
diff --git a/system/seahorse/patches/avoid_C99_incompatibility_around_seahorse_pkcs11_backend_initialize.patch b/system/seahorse/patches/avoid_C99_incompatibility_around_seahorse_pkcs11_backend_initialize.patch
new file mode 100644
index 00000000000..7fb8c10b58b
--- /dev/null
+++ b/system/seahorse/patches/avoid_C99_incompatibility_around_seahorse_pkcs11_backend_initialize.patch
@@ -0,0 +1,40 @@
+From 3887ba07ccab4aa970c24a22a183b97e255e6ece Mon Sep 17 00:00:00 2001
+From: Florian Weimer 
+Date: Fri, 14 Apr 2023 14:37:23 +0200
+Subject: [PATCH] Avoid C99 incompatibility around
+ seahorse_pkcs11_backend_initialize
+
+Move the prototype for seahorse_pkcs11_backend_initialize into the
+header file, so C code generated from Vala sources will use it.
+This avoids an implicit function declaration during the C-build
+of src/application.vala, and resulting build failures with future
+compilers.
+---
+ pkcs11/seahorse-pkcs11-backend.c | 2 --
+ pkcs11/seahorse-pkcs11-backend.h | 2 ++
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pkcs11/seahorse-pkcs11-backend.c b/pkcs11/seahorse-pkcs11-backend.c
+index b7ea21e1f..31d7cb815 100644
+--- a/pkcs11/seahorse-pkcs11-backend.c
++++ b/pkcs11/seahorse-pkcs11-backend.c
+@@ -43,8 +43,6 @@ enum {
+ 	PROP_LOADED,
+ };
+ 
+-void  seahorse_pkcs11_backend_initialize (void);
+-
+ static SeahorsePkcs11Backend *pkcs11_backend = NULL;
+ 
+ struct _SeahorsePkcs11Backend {
+diff --git a/pkcs11/seahorse-pkcs11-backend.h b/pkcs11/seahorse-pkcs11-backend.h
+index ddcfd2fcc..65efbd0a0 100644
+--- a/pkcs11/seahorse-pkcs11-backend.h
++++ b/pkcs11/seahorse-pkcs11-backend.h
+@@ -43,4 +43,6 @@ SeahorsePkcs11Backend *  seahorse_pkcs11_backend_get           (void);
+ GcrCollection *          seahorse_pkcs11_backend_get_writable_tokens (SeahorsePkcs11Backend *self,
+                                                                       gulong with_mechanism);
+ 
++void  seahorse_pkcs11_backend_initialize (void);
++
+ #endif /* SEAHORSE_PKCS11_BACKEND_H_ */
diff --git a/system/seahorse/patches/refactor_ssh_key_parsing.patch b/system/seahorse/patches/refactor_ssh_key_parsing.patch
new file mode 100644
index 00000000000..26568d115bf
--- /dev/null
+++ b/system/seahorse/patches/refactor_ssh_key_parsing.patch
@@ -0,0 +1,512 @@
+From 87a5e5312beac6cbe3b39f72cf0f120f1ed00473 Mon Sep 17 00:00:00 2001
+From: Niels De Graef 
+Date: Sat, 21 Oct 2023 15:43:04 +0200
+Subject: [PATCH] ssh: Refactor SSH key parsing
+
+Fix several issues in the SSH Key parsing code, and directly use a
+`GInputStream` we can (asynchronously) read from. Take the opportunity
+also to add some unit tests that we can run to make sure we're not
+regressing on anything.
+---
+ ssh/key-data.vala       |  59 +++++-----
+ ssh/key.vala            |  58 +++++-----
+ ssh/meson.build         |  20 ++++
+ ssh/source.vala         |   9 +-
+ ssh/test-key-parse.vala | 231 ++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 316 insertions(+), 61 deletions(-)
+ create mode 100644 ssh/test-key-parse.vala
+
+diff --git a/ssh/key-data.vala b/ssh/key-data.vala
+index 1fdb1e6a8..8843bff84 100644
+--- a/ssh/key-data.vala
++++ b/ssh/key-data.vala
+@@ -101,12 +101,12 @@ public class Seahorse.Ssh.KeyData : GLib.Object {
+         return result;
+     }
+ 
+-    internal static string parse_key_blob (uchar[] bytes) throws GLib.Error {
++    internal static string parse_key_blob(uchar[] bytes) throws GLib.Error {
+         string digest = Checksum.compute_for_data(ChecksumType.MD5, bytes);
+         if (digest == null)
+             throw new Error.GENERAL("Can't calculate fingerprint from key.");
+ 
+-        StringBuilder fingerprint = new StringBuilder.sized((digest.length * 3) / 2);
++        var fingerprint = new StringBuilder.sized((digest.length * 3) / 2);
+         for (size_t i = 0; i < digest.length; i += 2) {
+             if (i > 0)
+                 fingerprint.append_c(':');
+@@ -147,7 +147,7 @@ public class Seahorse.Ssh.KeyData : GLib.Object {
+         string contents;
+         FileUtils.get_contents(filename, out contents);
+ 
+-        StringBuilder results = new StringBuilder();
++        var results = new StringBuilder();
+ 
+         // Load each line
+         bool first = true;
+@@ -204,54 +204,65 @@ public class Seahorse.Ssh.SecData : GLib.Object {
+      *
+      * @param data The data that contains a private key.
+      */
+-    public static SecData parse_data(StringBuilder data) throws GLib.Error {
+-        SecData secdata = new SecData();
++    public static SecData parse_data(DataInputStream data, string initial_line) throws GLib.Error {
++        var secdata = new SecData();
+ 
+         // Get the comment
+-        if (data.str.has_prefix(SSH_KEY_SECRET_SIG)) {
+-            string comment = data.str.split("\n", 2)[0];
+-            secdata.comment = comment.substring(SSH_KEY_SECRET_SIG.length).strip();
++        if (initial_line.has_prefix(SSH_KEY_SECRET_SIG)) {
++            secdata.comment = initial_line.substring(SSH_KEY_SECRET_SIG.length).strip();
+         }
+ 
+         // First get our raw data (if there is none, don't bother)
+-        string rawdata = parse_lines_block(data, SSH_PRIVATE_BEGIN, SSH_PRIVATE_END);
++        string rawdata = parse_lines_block(data, initial_line, SSH_PRIVATE_BEGIN, SSH_PRIVATE_END);
+         if (rawdata == null || rawdata == "")
+             throw new Error.GENERAL("Private key contains no data.");
+ 
+         secdata.rawdata = rawdata;
+ 
+-        // Guess at the algorithm type
+-        secdata.algo = Algorithm.guess_from_string(rawdata);
++        // Guess the algorithm type by searching the base64 decoded data. (we
++        // should properly exclude the start/end line, but it shouldn't harm
++        // too much though afaik). Note that it's definitely not ideal though;
++        // but the openssh format isn't exactly obvious
++        var decoded = Base64.decode(rawdata.offset(initial_line.length));
++        for (uint i = 0; i < decoded.length - 3; i++) {
++            unowned var str = ((string) decoded).offset(i);
++            var algo = Algorithm.from_string(str);
++            if (algo != Algorithm.UNKNOWN) {
++                secdata.algo = algo;
++                break;
++            }
++        }
+ 
+         return secdata;
+     }
+ 
+-    /**
+-     * Takes everything between the start and end pattern and returns it.
+-     * NOTE: The string (if found will) be removed from the argument.
+-     */
+-    private static string parse_lines_block(StringBuilder data, string start, string end) {
+-        StringBuilder result = new StringBuilder();
++    /** Reads all lines from start until the end pattern and returns it */
++    private static string parse_lines_block(DataInputStream data,
++                                            string initial_line,
++                                            string start, string end)
++                                            throws GLib.Error {
++        var result = new StringBuilder();
++
++        string? line = initial_line;
+ 
+         bool start_found = false;
+-        string[] lines = data.str.split("\n");
+-        foreach (string line in lines) {
++        do {
+             // Look for the beginning
+             if (!start_found) {
+                 if (start in line) {
+-                    result.append_printf("%s\n", line);
+-                    result.erase(0, line.length + 1);
++                    result.append(line);
++                    result.append_c('\n');
+                     start_found = true;
+                     continue;
+                 }
+             } else {
+                 // Look for the end
+-                result.append_printf("%s\n", line);
+-                result.erase(0, line.length + 1);
++                result.append(line);
++                result.append_c('\n');
+                 if (end in line)
+                     break;
+             }
+-        }
++        } while ((line = data.read_line_utf8()) != null);
+ 
+         return result.str;
+     }
+diff --git a/ssh/key.vala b/ssh/key.vala
+index e2ebc30b3..453f8dd2c 100644
+--- a/ssh/key.vala
++++ b/ssh/key.vala
+@@ -223,24 +223,36 @@ public class Seahorse.Ssh.Key : Seahorse.Object, Seahorse.Exportable, Seahorse.D
+     }
+ 
+     /**
+-     * Parses a string into public/private keys.
++     * Parses an input stream into public/private keys.
+      *
+-     * @param data The string that needs to be parsed.
++     * @param input The input stream that needs to be parsed.
+      * @param cancellable Can be used to cancel the parsing.
+      */
+-    public static async KeyParseResult parse(string data,
+-                                             Cancellable? cancellable = null) throws GLib.Error {
+-        return_if_fail (data != null || data != "");
+-
++    public static async KeyParseResult parse(GLib.InputStream input,
++                                             Cancellable? cancellable = null)
++                                             throws GLib.Error {
+         var pubkeys = new GenericArray();
+         var seckeys = new GenericArray();
+ 
+-        StringBuilder toParse = new StringBuilder(data.chug());
+-        while (toParse.str.length > 0) {
++        // Fetch the data into a string
++        var data = new DataInputStream(input);
++
++        while (true) {
++            // Read the next line, and remove leading whitespace
++            var raw_line = yield data.read_line_utf8_async(Priority.DEFAULT, cancellable, null);
++            if (raw_line == null)
++                break;
++
++            string line = raw_line.chug();
++
++            // Ignore comments and empty lines (not a parse error, but no data)
++            if (line == "" || line.has_prefix("#"))
++                continue;
++
+             // First of all, check for a private key, as it can span several lines
+-            if (SecData.contains_private_key(toParse.str)) {
++            if (SecData.contains_private_key(line)) {
+                 try {
+-                    var secdata = SecData.parse_data(toParse);
++                    var secdata = SecData.parse_data(data, line);
+                     seckeys.add(secdata);
+                     continue;
+                 } catch (GLib.Error e) {
+@@ -248,24 +260,9 @@ public class Seahorse.Ssh.Key : Seahorse.Object, Seahorse.Exportable, Seahorse.D
+                 }
+             }
+ 
+-            // We're sure we'll have at least 1 element
+-            string[] lines = toParse.str.split("\n", 2);
+-            string line = lines[0];
+-            toParse.erase(0, line.length);
+-            if (lines.length == 2) // There was a \n, so don't forget to erase it as well
+-                toParse.erase(0, 1);
+-
+-            // Comments and empty lines, not a parse error, but no data
+-            if (line.strip() == "" || line.has_prefix("#"))
+-                continue;
+-
+             // See if we have a public key
+-            try {
+-                KeyData keydata = KeyData.parse_line(line);
+-                pubkeys.add(keydata);
+-            } catch (GLib.Error e) {
+-                warning(e.message);
+-            }
++            var keydata = KeyData.parse_line(line);
++            pubkeys.add(keydata);
+         }
+ 
+         var result = KeyParseResult();
+@@ -282,9 +279,8 @@ public class Seahorse.Ssh.Key : Seahorse.Object, Seahorse.Exportable, Seahorse.D
+      */
+     public static async KeyParseResult parse_file(string filename,
+                                                   Cancellable? cancellable = null) throws GLib.Error {
+-        string contents;
+-        FileUtils.get_contents(filename, out contents);
+-
+-        return yield parse(contents, cancellable);
++        var file = GLib.File.new_for_path(filename);
++        var file_stream = yield file.read_async();
++        return yield parse(file_stream, cancellable);
+     }
+ }
+diff --git a/ssh/meson.build b/ssh/meson.build
+index 15418772e..c2c81a6a9 100644
+--- a/ssh/meson.build
++++ b/ssh/meson.build
+@@ -58,3 +58,23 @@ ssh_askpass = executable('ssh-askpass',
+   install: true,
+   install_dir: libexecbindir,
+ )
++
++# Tests
++ssh_test_names = [
++  'key-parse',
++]
++
++foreach _test : ssh_test_names
++  test_bin = executable(_test,
++    files('test-@0@.vala'.format(_test)),
++    dependencies: [
++      ssh_dep,
++      ssh_dependencies,
++    ],
++    include_directories: include_directories('..'),
++  )
++
++  test(_test, test_bin,
++    suite: 'ssh',
++  )
++endforeach
+diff --git a/ssh/source.vala b/ssh/source.vala
+index c4646c9fb..43b4a1ab0 100644
+--- a/ssh/source.vala
++++ b/ssh/source.vala
+@@ -333,15 +333,12 @@ public class Seahorse.Ssh.Source : GLib.Object, Gcr.Collection, Seahorse.Place {
+     /**
+      * Parse an inputstream into a list of keys and import those keys.
+      */
+-    public async List? import_async(InputStream input, Gtk.Window transient_for,
++    public async List? import_async(InputStream input,
++                                         Gtk.Window? transient_for,
+                                          Cancellable? cancellable = null) throws GLib.Error {
+-        uint8[] buffer = new uint8[4096];
+-        size_t bytes_read;
+-        input.read_all(buffer, out bytes_read, cancellable);
++        var result = yield Key.parse(input, cancellable);
+ 
+         string fullpath = other_keys_path();
+-
+-        var result = yield Key.parse((string) buffer, cancellable);
+         foreach (unowned var keydata in result.public_keys) {
+             yield import_public_async(keydata, fullpath, cancellable);
+         }
+diff --git a/ssh/test-key-parse.vala b/ssh/test-key-parse.vala
+new file mode 100644
+index 000000000..ef9404790
+--- /dev/null
++++ b/ssh/test-key-parse.vala
+@@ -0,0 +1,231 @@
++/*
++ * Seahorse
++ *
++ * Copyright (C) 2023 Niels De Graef
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++ * See the GNU General Public License for more details.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, see
++ * .
++ */
++
++void main(string[] args) {
++  Test.init(ref args);
++
++  Test.add_func("/ssh/key-parse/pubkey-simple", test_key_parse_pubkey_simple);
++  Test.add_func("/ssh/key-parse/pubkey-bad-algo", test_key_parse_pubkey_bad_algo);
++  Test.add_func("/ssh/key-parse/pubkey-multple", test_key_parse_pubkey_multiple);
++
++  Test.add_func("/ssh/key-parse/private-key-simple", test_key_parse_private_key_simple);
++  Test.add_func("/ssh/key-parse/private-key-pw-protected", test_key_parse_private_key_pw_protected);
++
++  Test.run();
++}
++
++const string PUBKEY_SIMPLE = """
++ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCi9ZNp78OzcMpR9QeSKKCybNxTR+ailXs3cwizr1R9Dlx/EobQBXOwE2Ed5PqSU5HEgtYRoKqlTxMogMXMX508dedC0ADTzM09B3OBqpZ7YnMuyLbtk1MNP8xcvVmHwwfw3Y79xxZZeqjUTI7cSE6jcNyz/k/Dl+6RYI552ab80b1kgDDwOyUL75hFllEZ9vHCcAOtk7y5LyeUpnRu5WJq0YBPVQljeYs23ZiTSo5NkJd7pvV9hs68ZAYqm1POXwCcAKOj4HXW3AL83AD49g8MJOAelCMaJpUkOgn4n4QTtqLEC108sqZgwWiadbN/ZHt3Idbn3AIxMMhD/wdkSwkfm9tAohMrqYpSiG31xyifH61mcoBMSxRMQhUscCGV3kLo6P/dZtxRbu4r74r/Ae2Jg4pzYrVFVzfObXdlTjtxJmR8UvnZg60OE0RwYMs1LJTE6xakcAg22O9i3bau00MoIIYEPgiFFP5t0Tw3D06BcEzr/2wEzlvbxy0qzDTr40U= testsimple
++""";
++
++private void test_key_parse_pubkey_simple() {
++  var input = new MemoryInputStream.from_data(PUBKEY_SIMPLE.data);
++
++  var mainloop = new GLib.MainLoop();
++  Seahorse.Ssh.Key.parse.begin(input, null, (obj, res) => {
++      try {
++          var parse_result = Seahorse.Ssh.Key.parse.end(res);
++
++          assert_true(parse_result.public_keys.length == 1);
++          unowned var keydata = parse_result.public_keys[0];
++          assert_true(keydata.comment == "testsimple");
++          assert_true(keydata.algo == Seahorse.Ssh.Algorithm.RSA);
++
++          assert_true(parse_result.secret_keys.length == 0);
++      } catch (Error err) {
++          error("Couldn't parse public key: %s", err.message);
++      } finally {
++          mainloop.quit();
++      }
++  });
++  mainloop.run();
++}
++
++// Basically the same as PUBKEY_SIMPLE, but a bogus algorithm
++const string PUBKEY_BAD_ALGO = """
++ssh-blabla AAAAB3NzaC1yc2EAAAADAQABAAABgQCi9ZNp78OzcMpR9QeSKKCybNxTR+ailXs3cwizr1R9Dlx/EobQBXOwE2Ed5PqSU5HEgtYRoKqlTxMogMXMX508dedC0ADTzM09B3OBqpZ7YnMuyLbtk1MNP8xcvVmHwwfw3Y79xxZZeqjUTI7cSE6jcNyz/k/Dl+6RYI552ab80b1kgDDwOyUL75hFllEZ9vHCcAOtk7y5LyeUpnRu5WJq0YBPVQljeYs23ZiTSo5NkJd7pvV9hs68ZAYqm1POXwCcAKOj4HXW3AL83AD49g8MJOAelCMaJpUkOgn4n4QTtqLEC108sqZgwWiadbN/ZHt3Idbn3AIxMMhD/wdkSwkfm9tAohMrqYpSiG31xyifH61mcoBMSxRMQhUscCGV3kLo6P/dZtxRbu4r74r/Ae2Jg4pzYrVFVzfObXdlTjtxJmR8UvnZg60OE0RwYMs1LJTE6xakcAg22O9i3bau00MoIIYEPgiFFP5t0Tw3D06BcEzr/2wEzlvbxy0qzDTr40U= testbad
++""";
++
++private void test_key_parse_pubkey_bad_algo() {
++  var input = new MemoryInputStream.from_data(PUBKEY_BAD_ALGO.data);
++
++  var mainloop = new GLib.MainLoop();
++  Seahorse.Ssh.Key.parse.begin(input, null, (obj, res) => {
++      try {
++          Seahorse.Ssh.Key.parse.end(res);
++          assert_not_reached();
++      } catch (Error err) {
++          // Expected
++      } finally {
++          mainloop.quit();
++      }
++  });
++  mainloop.run();
++}
++
++const string PUBKEY_MULTIPLE = """
++ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCi9ZNp78OzcMpR9QeSKKCybNxTR+ailXs3cwizr1R9Dlx/EobQBXOwE2Ed5PqSU5HEgtYRoKqlTxMogMXMX508dedC0ADTzM09B3OBqpZ7YnMuyLbtk1MNP8xcvVmHwwfw3Y79xxZZeqjUTI7cSE6jcNyz/k/Dl+6RYI552ab80b1kgDDwOyUL75hFllEZ9vHCcAOtk7y5LyeUpnRu5WJq0YBPVQljeYs23ZiTSo5NkJd7pvV9hs68ZAYqm1POXwCcAKOj4HXW3AL83AD49g8MJOAelCMaJpUkOgn4n4QTtqLEC108sqZgwWiadbN/ZHt3Idbn3AIxMMhD/wdkSwkfm9tAohMrqYpSiG31xyifH61mcoBMSxRMQhUscCGV3kLo6P/dZtxRbu4r74r/Ae2Jg4pzYrVFVzfObXdlTjtxJmR8UvnZg60OE0RwYMs1LJTE6xakcAg22O9i3bau00MoIIYEPgiFFP5t0Tw3D06BcEzr/2wEzlvbxy0qzDTr40U= test1
++ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDADxtTchMRaGP2YCG5Iiu/sCkdKYkogkZ9NrawGutvwcoQL4D3oIC+r+ka3YzenICz0Rpu4ZIyGzn5s7VISzjcGK99a8/UoXsSyTUy37ihbpAbkYju+avtJZyCMOrRyrXp0W8gSKnUuxDJJNlG5+Jhjdh35rGo7ENSDIGRBXx0uLmKvxbPGSQoULbUzxJRVes6HW7cr44RXG4GL5uekS5hSHN/wJuc/OBqT2ETn+Ivn8cj2fooR6Y7Ei6uFNwbNebYgzDzNOTfaGssCXoEqWL9dJA8FAXA9u4BQskIaUm9SiQblzKGZSKtoPPFh7Sp7Ii1k2TAG0g9VW8gYqUZgLZY4OKjARR+SkdyzlnJKOD1QuSIrnyDNOgl7SBwtujT6gg+9bcQzSPVRWuPldYj2qYEZiR7LPood7AvzDL2tZwb8r60O5KDip+66inj5BxmPO6Vmeo84DLXdZNhEnoCfaL5J9qArhTvxYPjU8RiuBoy6nqN00IWeT2e3RZTPjpq1wc= test2
++""";
++
++private void test_key_parse_pubkey_multiple() {
++  var input = new MemoryInputStream.from_data(PUBKEY_MULTIPLE.data);
++
++  var mainloop = new GLib.MainLoop();
++  Seahorse.Ssh.Key.parse.begin(input, null, (obj, res) => {
++      try {
++          var parse_result = Seahorse.Ssh.Key.parse.end(res);
++          assert_true(parse_result.public_keys.length == 2);
++          assert_true(parse_result.secret_keys.length == 0);
++      } catch (Error err) {
++          error("Couldn't parse public key: %s", err.message);
++      } finally {
++          mainloop.quit();
++      }
++  });
++  mainloop.run();
++}
++
++const string PRIVATE_KEY_SIMPLE = """
++-----BEGIN OPENSSH PRIVATE KEY-----
++b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABlwAAAAdzc2gtcn
++NhAAAAAwEAAQAAAYEAvR0sY6LuyQBk0eWtHlblilTu5ywOxIPtX5Xz1DQ/nTs3+EiuUjpX
++7wpBd0X8KLVwF8XqrgsS/cZGKKwwTTIthifiOkIin2M1c5zqjq5mYXLd8OVy7FPGz3kRcY
++bqcZ5IhH6rrccLKgqz8F8YDZ1PP/zViRV6pjL4M9V+vM50JNbc09o199rOhrIfzWpbmbsU
++L98ADNFdyAexJAo46I5KF4ABp43y8fxKVkOQmouN92ao5s4tktkU2RDieAQEGS5tCcuabM
++vyq+nsZ3SxhAAM+k1A98F4sDaPBLMvQrGTRfIhbtPEqJsffzmoNiLsuFooCB8bbrpb5gp0
++pvoQCDomWPR618KJSt6c2JCpxd0v64N+xaGjeuKnH+nGeQ2I8KjGz49bpTsNU/XHSAJHS8
++72GiVZ1sVeEGxU2nR58Faixg6quEQr/SjjFCLTjV1v9zXmYLGUC2WoYrvh8Xv1/5u11WG9
++jxbZrwNeHR5b0mL4espyAaxhyP093cRj0am3HX03AAAFiLLBfcCywX3AAAAAB3NzaC1yc2
++EAAAGBAL0dLGOi7skAZNHlrR5W5YpU7ucsDsSD7V+V89Q0P507N/hIrlI6V+8KQXdF/Ci1
++cBfF6q4LEv3GRiisME0yLYYn4jpCIp9jNXOc6o6uZmFy3fDlcuxTxs95EXGG6nGeSIR+q6
++3HCyoKs/BfGA2dTz/81YkVeqYy+DPVfrzOdCTW3NPaNffazoayH81qW5m7FC/fAAzRXcgH
++sSQKOOiOSheAAaeN8vH8SlZDkJqLjfdmqObOLZLZFNkQ4ngEBBkubQnLmmzL8qvp7Gd0sY
++QADPpNQPfBeLA2jwSzL0Kxk0XyIW7TxKibH385qDYi7LhaKAgfG266W+YKdKb6EAg6Jlj0
++etfCiUrenNiQqcXdL+uDfsWho3ripx/pxnkNiPCoxs+PW6U7DVP1x0gCR0vO9holWdbFXh
++BsVNp0efBWosYOqrhEK/0o4xQi041db/c15mCxlAtlqGK74fF79f+btdVhvY8W2a8DXh0e
++W9Ji+HrKcgGsYcj9Pd3EY9Gptx19NwAAAAMBAAEAAAGAEepQGLZIObl0U6AW+N9RinvGUB
++cP5RT8aUg625kBh8Mi57326apGR0po7kQugarCjjX9J/S7nVfpsJOzVbTRtDpWB5/ZSNEs
++sKGmZNLntwabOOV7sCC1nlUBTohx8EaG5ypa2DEZgSeXaUeQ70U+SzkH/58Nye3dLofkpD
++1Iqm7CZ71tzGeplgAM3DhdqiAbZveQuSYiZL85zEi9oGZOZZCGV5mucLcuUaK/8awTzGKo
++0Iiqr5UqEPA1DBqRStNnbfu265Zc/VacI0Z+00dMiO7VQ1lB5TnO9MkuEU3Kd59sHKvuX0
++Hw5V2BqvJVqdqF5j6yxAExD7J8JNybcpE+LXzgysTBAEg2QPQa4GzWERytWSddVU+LTrEu
++BOb8o2bMV4eHbo7Y06ziq+MJQIDWJr7qNMbDtaV5UCNWcIlYaKX9X8si0qFBzHPRTx53aV
++beb4C5G8Ce4HU4Q3eEC0idCSpALEZEb8NIqxHigWuQKlqAhju31IIFjPoJ8uvs/49VAAAA
++wD2DtKmKzpZrguKjUrMTtCyh8cRxvvACe5ij6oPlhnJJ3Hlyb5QkH/FMqudJhkOaZrLjz0
++JFLXQ4SUoUxdnolBb5B6wNfL66CXCurwR8MzHxHZyNL2+EB/jHhgF5Oh631LShe9GHJ+nE
++umN9zzDmW4pfWIoUZbzaNi2IQS4Qv+pJWk/uQFzqnS39HQkdgNh8s3sPJQUvykgbD24vNu
++qzML23S3NxsJfxJzsl8HL7LTaf08toSXeNqif4iPxuy0F9nAAAAMEA+MjSgU7GxqAjgE+7
++zTKbEAw2WZhSWk+sHDSzTpt7T6JhTbsD0I+ZXqb3lcrKTnxjGP8bj4zWeH/mtpVCRDb/xE
++cOjku/aszvCBHKcD9naE+U/pOqwWR60jPb65+2hvBxqCFKb+2FVeM7E7BYL4kSQ/FV3svu
++rCQ0+liFnD4VxDbvNHDXz2h9RlqYTjZ90/d5I4oibuHPvcy3jMri99qBuvPj/8BhfPBmKw
++o+VZpJbWHEfuDZx1Rr3vRx3VtmfLLFAAAAwQDCmU8SYZ/GYR/EQU3MfIK/3wVKiasBh3a/
++gIgD1+wnobau0MHd8vvGdehLPNVHKQ0/QkOsIdQl1XEKXFaNNGo8ZMHsawacdRze7ulfpe
++LSYdlqKqu73m2wy8LsY+IGSZGRkjCK1LNJevU8ec0nHSUGIn49VK+jPPjyNGHZw5yIL8QE
++nmvLcmgqiGQHjsArmk4NAdA5LGJSF3EfSKDx1Rs1CKCn/3+tpIbTpVZl6r1IDpuLPOvtYO
++f5GQO1BGgcf8sAAAAQbmRlZ3JhZWZAdG9vbGJveAECAw==
++-----END OPENSSH PRIVATE KEY-----
++""";
++
++private void test_key_parse_private_key_simple() {
++  var input = new MemoryInputStream.from_data(PRIVATE_KEY_SIMPLE.data);
++
++  var mainloop = new GLib.MainLoop();
++  Seahorse.Ssh.Key.parse.begin(input, null, (obj, res) => {
++      try {
++          var parse_result = Seahorse.Ssh.Key.parse.end(res);
++          assert_true(parse_result.public_keys.length == 0);
++
++          assert_true(parse_result.secret_keys.length == 1);
++          unowned var secdata = parse_result.secret_keys[0];
++          assert_null(secdata.comment);
++          assert_true(secdata.algo == Seahorse.Ssh.Algorithm.RSA);
++      } catch (Error err) {
++          error("Couldn't parse private key: %s", err.message);
++      } finally {
++          mainloop.quit();
++      }
++  });
++  mainloop.run();
++}
++
++// Key with "test" password
++const string PRIVATE_KEY_PW_PROTECTED = """
++-----BEGIN OPENSSH PRIVATE KEY-----
++b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABAkHotf4u
++iTM795vuCNSfZBAAAAEAAAAAEAAAGXAAAAB3NzaC1yc2EAAAADAQABAAABgQDcelHwoS/V
++AG2fg+gUkDFswBxazTuSASmXs5JXCPt3LpYRS38xr+LXH8APUBLoVTJbmU3QFMg9SCNVGp
++5hGKE3mYt9+EIMQQrQfSTGfU0JwLldNyO9pIPDW1ANjoP7fuGxVQpbHlbekNdZvVTarQS2
++bJlIq2V4YwROyK6NRUj0JtRxlR0PQsdoOuCnzB0HUsRR4aSBkieVEytLy+/nhjSn22bz+g
++1XW3FePmEEGWXfKtCLXAXSkLiTmT0AgFCZyjbYjxJHWvJZ1ndiVsQSQFuAkvMfzoflBhfT
++pUMU22rl0GVsycJ06HkI9GF4aHjqzADvS4AvynKt+CQ7K/PDSAeGxNC7qa26OmBQPPT3Xw
++2PjqpqHpa/Hlx/G3nAMC6lzefHhAJkAB2wGF4DS/OxGTaS3rf+lJEVU7WSbLH9C5kTiqxf
++dlTC88ln9J2xHgnwewXfYbBbjqBbt6F1xSYBstm4o64fWzXdbsh0PzBBixGkFN0LZRuymB
++t0+jcxZwBL/UcAAAWQsqRgReFcL5tiXLDHd+pZxv3+mIyrqszEnoAw6/BGkt7UAFu2Gx5B
++3acmLUS5rgUmij+duFWPL4yZ3MW5ZJmCk89lkRholdIdFsZO3qz0L+fZ8mPa5IGxomrDxN
++mZiMQGSS+JnGsYxylAVucGmld02kP6F4hGYKMYsyUUQPtDg3qGJ4xckWfCLtaPUO0siLui
++//1lzHdT0dmodAMAxcXbwmlOYcpHDxSH5H9IfhzhTGQpHHw7aWys80G1HHRiClQDQgWvIg
++Wj/U30k2RuJYtfgIAcacvp4Fk1UMdUazrwfAogrjkLF2A6jqgYW6r2S1sITbruz0GrmXZy
++XHMA+cO2XsizMZOZAxpJmSkA04sb/gPiXOb+vBHAtjhY42Oucc0xg97QH1KfjBWG7yAqyc
++NC4XQ38ipF/Fyx0YCiZSysL37PGZlZo/sa8B8/9yb4/oSgyFhtE7aR/VI69ZWMjYSoc3/E
++yGIzEf67IC/BKNqBV281h6jc7DTr7F5nsdUHB0JdNmLf7sCVzDPNw+Gc88jHoV8eki9NJ3
++X1vnzu2CnhvPYoVgb9GOmPAPD9PgB2W3wQ8lznIrcdKduWbi0uQJ8z/UWvJYs5nxZSBaW6
++elVmeKjonzK/MX+U0pmKJnYLMkZ88PolzCY0Bka3mwcQGUjyq+GdUjo5yY1eeSW8bwNNRJ
++3riCVg7Zga5EQyNcAjxUP9gLkeFcHyIhyLlRGLLKtuNa+EkvcXzNVvUs1rP8KkusZrcbuH
++yZMUjOAvauXMwAiEm042QEUlQz6HGtVqmOnmTbsZQQ/DZqrAEgX8FoiRlWG76uQxvfo4qd
++cf/y3wapJfawFZ8rkQUtq4FsLGtIv4KYUyWgYlzpQvLolvTaNFcZNO75T2RrJ4DW/z8nDl
++2EdS0H+VxMa9At0D0kxxkJAKqQRhrT4axs3IUqbOVk4ztkcLmlHaxC+spxwspYQjyx785r
++oNgLcQnesQqIpRe0uVBaHbdOGrvWs2TUKBWxjVeXVZkenwU1Mnu+STXKhzcvtU0jHuei/Y
++fFxQg1P/KG7KWr+qoD1zBsKCQpv04VgFotexapUU6sW9tJdIpiplha43xt1fWRPFz3VA+/
++GORk5nLRk1Rqdx8H1fClGACXyNy/jo4LyJavlH8j5eTdvbHAswEaXbR3XpXPUXlBXQRKzd
++INK8qEfl0Kk4SB/y/PLjr4J7xgFOTDtAbtZIa0T4woeIXbNd6D3gwG4VB7H8z56pms2sYf
++vE3a+xCGIdDyEqK3kNIy6j7ex3+E5AxHO0/vbG/2kDZlZUWI+9EeiMqLTx6QQeAQ9DQoDB
++E7BiJOPSJhjAhuTbxBaf29z8pC3P5EwJoRbpERoAlMmRoIdEL8UzHns97dB8mj0lgLJuYt
++1UEiuGgNI+7mtayMrMTmkPAH//v8b4JfyHSFOcMIFvQGd8Lf8/nl0sdhB/eVAKGxSYtRvE
++65cjw6U9afG+wyNkISHAtOXB2g4HTbwHRSsq5451z8kbMlSMufKoaI7NlWXtiStjgXA2TI
++4b/5STOu15kfnEDWrW0uUQkWodKZqvr+p1fbvM8ijysA8rfqCgqSu9XMaQYNeqn2p7Exp5
++dsZBpE6gkNJjgHkhgUeBHtvkQmnXaj87kPkDOL2gnvWzVEnZiUBQZgL1O9Z3Qr0+PuSrkh
++QIwPO0umkWA4qRkd4vh1SAg/vyOeDgdAxmcHm3So2IxOKQnBmWBIgsxkaei4d2yUvqLhmY
++9dbjgNZnyh81Rf2bkYPvnUhf1anKyxyRcbybQMdGJS4u3J7RO246+VbpPDvDm7cL5wbGol
++Q9Y8O2PciUoksK03RCdyeoKpJ2VdAvve5TyNs0aLYmpemYyl7rA7s4STR/gSWzBRPYWxbI
++Znmynq4dXIf58Nj4+TpgQkxQwxM=
++-----END OPENSSH PRIVATE KEY-----
++""";
++
++private void test_key_parse_private_key_pw_protected() {
++  var input = new MemoryInputStream.from_data(PRIVATE_KEY_PW_PROTECTED.data);
++
++  var mainloop = new GLib.MainLoop();
++  Seahorse.Ssh.Key.parse.begin(input, null, (obj, res) => {
++      try {
++          var parse_result = Seahorse.Ssh.Key.parse.end(res);
++          assert_true(parse_result.public_keys.length == 0);
++
++          assert_true(parse_result.secret_keys.length == 1);
++          unowned var secdata = parse_result.secret_keys[0];
++          assert_null(secdata.comment);
++          assert_true(secdata.algo == Seahorse.Ssh.Algorithm.RSA);
++      } catch (Error err) {
++          error("Couldn't parse private key: %s", err.message);
++      } finally {
++          mainloop.quit();
++      }
++  });
++  mainloop.run();
++}
diff --git a/system/seahorse/patches/seahorse-ssh-return-type.patch b/system/seahorse/patches/seahorse-ssh-return-type.patch
new file mode 100644
index 00000000000..5faa34d923d
--- /dev/null
+++ b/system/seahorse/patches/seahorse-ssh-return-type.patch
@@ -0,0 +1,25 @@
+From 0fffa8a708c421b019dba3f92ad802d02e86495d Mon Sep 17 00:00:00 2001
+From: ppw 0 
+Date: Wed, 6 Dec 2023 12:16:45 +0000
+Subject: [PATCH] Update file operation.vala
+
+---
+ ssh/operation.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ssh/operation.vala b/ssh/operation.vala
+index 4743d0a5..48a525c3 100644
+--- a/ssh/operation.vala
++++ b/ssh/operation.vala
+@@ -49,7 +49,7 @@ public abstract class Operation : GLib.Object {
+     protected async string? operation_async(string command,
+                                             string? input,
+                                             Cancellable? cancellable) throws GLib.Error {
+-        return_val_if_fail (command != null && command != "", null);
++        return_val_if_fail (command != null && command != "", false);
+ 
+         // Strip the command name for logging purposes
+         string[] args;
+-- 
+GitLab
+
diff --git a/system/seahorse/seahorse.SlackBuild b/system/seahorse/seahorse.SlackBuild
index 56e30659519..465979e3457 100644
--- a/system/seahorse/seahorse.SlackBuild
+++ b/system/seahorse/seahorse.SlackBuild
@@ -8,7 +8,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=seahorse
-VERSION=${VERSION:-3.18.0}
+VERSION=${VERSION:-43.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -62,29 +62,33 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+for i in $CWD/patches/*.patch ; do
+  patch -p1 < $i
+done
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+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
 
-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 \
-  AUTHORS COPYING* INSTALL MAINTAINERS NEWS README THANKS TODO \
+  COPYING* NEWS README.md THANKS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/seahorse/seahorse.info b/system/seahorse/seahorse.info
index 39a0da1d79a..d25073297a2 100644
--- a/system/seahorse/seahorse.info
+++ b/system/seahorse/seahorse.info
@@ -1,8 +1,8 @@
 PRGNAM="seahorse"
-VERSION="3.18.0"
+VERSION="43.0"
 HOMEPAGE="http://projects.gnome.org/seahorse/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/seahorse/3.18/seahorse-3.18.0.tar.xz"
-MD5SUM="758204ac248e1fb3b3767ce84d2795b4"
+DOWNLOAD="https://download.gnome.org/sources/seahorse/43/seahorse-43.0.tar.xz"
+MD5SUM="efa9fea2e1c4291c39d509eb366b9a56"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/spacefm/spacefm.SlackBuild b/system/spacefm/spacefm.SlackBuild
index 72708b0a0c6..376de85e54b 100644
--- a/system/spacefm/spacefm.SlackBuild
+++ b/system/spacefm/spacefm.SlackBuild
@@ -96,7 +96,7 @@ patch -p1 < $CWD/glibc-2.28.patch
 # https://github.com/IgnorantGuru/spacefm/issues/770
 patch -p1 < $CWD/gcc10.patch
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/system/stow/README b/system/stow/README
deleted file mode 100644
index c56e6bfac2d..00000000000
--- a/system/stow/README
+++ /dev/null
@@ -1,13 +0,0 @@
-GNU Stow is a symlink farm manager which takes distinct packages of
-software and/or data located in separate directories on the
-filesystem, and makes them appear to be installed in the same place.
-
-This is particularly useful for keeping track of system-wide and
-per-user installations of software built from source, but can also
-facilitate a more controlled approach to management of configuration
-files in the user's home directory, especially when coupled with
-version control systems.
-
-Stow is implemented as a combination of a Perl script providing a CLI
-interface, and a backend Perl module which does most of the work. Stow
-is Free Software, licensed under the GNU General Public License.
diff --git a/system/stow/slack-desc b/system/stow/slack-desc
deleted file mode 100644
index 694ec415d7b..00000000000
--- a/system/stow/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------------------------------------------------------|
-stow: stow (manage source installs)
-stow:
-stow: GNU Stow is a symlink farm manager which takes distinct packages of
-stow: software and/or data located in separate directories on the
-stow: filesystem, and makes them appear to be installed in the same place.
-stow:
-stow: This is particularly useful for keeping track of system-wide and
-stow: per-user installations of software built from source, but can also
-stow: facilitate a more controlled approach to management of configuration
-stow: files in the user's home directory, especially when coupled with
-stow: version control systems.
diff --git a/system/stow/stow.SlackBuild b/system/stow/stow.SlackBuild
deleted file mode 100644
index 64b4d893882..00000000000
--- a/system/stow/stow.SlackBuild
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for stow
-
-# Copyright 2018, 2019 Pedro R.M. Júnior, Campinas, SP, Brazil
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=stow
-VERSION=${VERSION:-2.3.1}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-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
-
-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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-make
-make install-strip DESTDIR=$PKG
-
-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
-
-mv $PKG/usr/share/info $PKG/usr/ # move info dir to usual place for Slackware
-rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*.info*
-
-cp -a \
-   AUTHORS COPYING ChangeLog INSTALL.md NEWS README.md THANKS TODO \
-   $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
diff --git a/system/stow/stow.info b/system/stow/stow.info
deleted file mode 100644
index 2b4c944068d..00000000000
--- a/system/stow/stow.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="stow"
-VERSION="2.3.1"
-HOMEPAGE="https://www.gnu.org/software/stow"
-DOWNLOAD="https://ftp.gnu.org/gnu/stow/stow-2.3.1.tar.bz2"
-MD5SUM="d18bea2eb6369f52af8cdb9c91bc93ac"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Pedro R.M. Júnior"
-EMAIL="pedrormjunior@gmail.com"
diff --git a/system/trrntzip/slack-desc b/system/trrntzip/slack-desc
index eecb353ad1c..ae8002db6de 100644
--- a/system/trrntzip/slack-desc
+++ b/system/trrntzip/slack-desc
@@ -15,5 +15,5 @@ trrntzip:
 trrntzip:
 trrntzip:
 trrntzip:
-trrntzip: https://sourceforge.net/projects/trrntzip/
+trrntzip: https://github.com/0-wiz-0/trrntzip/
 trrntzip:
diff --git a/system/trrntzip/trrntzip.SlackBuild b/system/trrntzip/trrntzip.SlackBuild
index 1a8fa43f805..2e59a1dd863 100644
--- a/system/trrntzip/trrntzip.SlackBuild
+++ b/system/trrntzip/trrntzip.SlackBuild
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=trrntzip
-VERSION=${VERSION:-v02}
+VERSION=${VERSION:-1.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -64,9 +64,9 @@ set -eu
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/${PRGNAM}_${VERSION}_src.tar.gz
-cd $PRGNAM
+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 \
@@ -74,20 +74,18 @@ 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 {} \;
 
-# A small patch to fix a permissions issue:
-patch -p1 < $CWD/trrntzip_permission_fix.diff
-
-./autogen.sh
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr
-
-make
-make install-strip DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
-      $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING *.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/system/trrntzip/trrntzip.info b/system/trrntzip/trrntzip.info
index 78587635865..e5af1235a9c 100644
--- a/system/trrntzip/trrntzip.info
+++ b/system/trrntzip/trrntzip.info
@@ -1,8 +1,8 @@
 PRGNAM="trrntzip"
-VERSION="v02"
-HOMEPAGE="https://sourceforge.net/projects/trrntzip/"
-DOWNLOAD="https://downloads.sourceforge.net/trrntzip/trrntzip_v02_src.tar.gz"
-MD5SUM="2635a4042b3cf5611ffdffb4019ec8b7"
+VERSION="1.3"
+HOMEPAGE="https://github.com/0-wiz-0/trrntzip/"
+DOWNLOAD="https://github.com/0-wiz-0/trrntzip/archive/v1.3/trrntzip-1.3.tar.gz"
+MD5SUM="712ebea3daf181bce4c67473bafed513"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/uhd/uhd.SlackBuild b/system/uhd/uhd.SlackBuild
index 54aa0051ed0..5e8171fa21e 100644
--- a/system/uhd/uhd.SlackBuild
+++ b/system/uhd/uhd.SlackBuild
@@ -85,6 +85,15 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
+# fix building with gcc >= 13.x
+sed -i s/\#include\ \/\#include\ \\\n\#include\ \/ ./include/uhd/cal/database.hpp
+sed -i s/\#include\ \/\#include\ \\\n\#include\ \/ ./include/uhd/rfnoc/defaults.hpp
+sed -i s/\#include\ \/\#include\ \\\n\#include\ \/ ./lib/usrp/dboard/magnesium/magnesium_constants.hpp
+sed -i s/\#include\ \/\#include\ \\\n\#include\ \/ ./lib/usrp/dboard/rhodium/rhodium_constants.hpp
+sed -i s/\#include\ \/\#include\ \\\n\#include\ \/ ./include/uhd/types/eeprom.hpp
+sed -i s/\#include\ \/\#include\ \\\n\#include\ \/ ./lib/include/uhdlib/utils/serial_number.hpp
+sed -i s/\#include\ "cast.h"/\#include\ "cast.h"\\n\#include\ \/ ./lib/deps/pybind11/include/pybind11/attr.h
+
 mkdir -p build
 cd build
   cmake \
diff --git a/system/usbredir/usbredir.SlackBuild b/system/usbredir/usbredir.SlackBuild
index 93d9db22bce..b260b01ac99 100644
--- a/system/usbredir/usbredir.SlackBuild
+++ b/system/usbredir/usbredir.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Slackware build script for usbredir
-# Copyright 2013-2023 Matteo Bernardini , Pisa, Italy
+# Copyright 2013-2024 Matteo Bernardini , Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=usbredir
-VERSION=${VERSION:-0.13.0}
+VERSION=${VERSION:-0.14.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -37,9 +37,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
diff --git a/system/usbredir/usbredir.info b/system/usbredir/usbredir.info
index 0924b9aa87b..0778f581684 100644
--- a/system/usbredir/usbredir.info
+++ b/system/usbredir/usbredir.info
@@ -1,8 +1,8 @@
 PRGNAM="usbredir"
-VERSION="0.13.0"
+VERSION="0.14.0"
 HOMEPAGE="https://www.spice-space.org"
-DOWNLOAD="https://www.spice-space.org/download/usbredir/usbredir-0.13.0.tar.xz"
-MD5SUM="8b6766c0de82cb686486ea141b25f5f2"
+DOWNLOAD="https://www.spice-space.org/download/usbredir/usbredir-0.14.0.tar.xz"
+MD5SUM="68f232c87c086a25c13fc71ddbdc28a5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/veracrypt/32bit.patch b/system/veracrypt/32bit.patch
new file mode 100644
index 00000000000..b5d78d25787
--- /dev/null
+++ b/system/veracrypt/32bit.patch
@@ -0,0 +1,23 @@
+diff -Naur veracrypt-1.26.7.orig/src/Common/PCSCException.cpp veracrypt-1.26.7/src/Common/PCSCException.cpp
+--- veracrypt-1.26.7.orig/src/Common/PCSCException.cpp	2023-10-01 18:52:55.000000000 +0200
++++ veracrypt-1.26.7/src/Common/PCSCException.cpp	2024-06-04 10:00:30.424227000 +0200
+@@ -140,14 +140,17 @@
+ 	{
+ 		Exception::Deserialize(stream);
+ 		Serializer sr(stream);
+-		sr.Deserialize("ErrorCode", ErrorCode);
++		int64 v;
++		sr.Deserialize("ErrorCode", v);
++		ErrorCode = (LONG_PCSC)v;
+ 	}
+ 
+ 	void PCSCException::Serialize(shared_ptr  stream) const
+ 	{
+ 		Exception::Serialize(stream);
+ 		Serializer sr(stream);
+-		sr.Serialize("ErrorCode", ErrorCode);
++		int64 v = (int64)ErrorCode;
++		sr.Serialize("ErrorCode", v);
+ 	}
+ 
+ #	define TC_EXCEPTION(TYPE) TC_SERIALIZER_FACTORY_ADD(TYPE)
diff --git a/system/veracrypt/veracrypt.SlackBuild b/system/veracrypt/veracrypt.SlackBuild
index 530c4fa8fbe..8aa1e4b0547 100644
--- a/system/veracrypt/veracrypt.SlackBuild
+++ b/system/veracrypt/veracrypt.SlackBuild
@@ -32,8 +32,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=veracrypt
-VERSION=${VERSION:-1.25.7}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.26.7}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -85,8 +85,11 @@ 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 {} \+
 
+# https://sourceforge.net/p/veracrypt/discussion/general/thread/a8003fa49c/#3eae
+if [[ $(uname -m) =~ i*86 ]]; then patch -p1 < $CWD/32bit.patch ; fi
+
 cd src
-make WX_CONFIG=/usr/lib$LIBDIRSUFFIX/wx/config/gtk3-unicode-3.0
+make WX_CONFIG=/usr/lib$LIBDIRSUFFIX/wx/config/gtk3-unicode-3.2
 make package
 cp -av Setup/Linux/usr $PKG
 rm -f $PKG/usr/bin/veracrypt-uninstall.sh
diff --git a/system/veracrypt/veracrypt.info b/system/veracrypt/veracrypt.info
index 7d86631c142..56827648041 100644
--- a/system/veracrypt/veracrypt.info
+++ b/system/veracrypt/veracrypt.info
@@ -1,10 +1,10 @@
 PRGNAM="veracrypt"
-VERSION="1.25.7"
+VERSION="1.26.7"
 HOMEPAGE="https://www.veracrypt.fr/"
-DOWNLOAD="https://launchpad.net/veracrypt/trunk/1.25.7/+download/VeraCrypt_1.25.7_Source.tar.bz2"
-MD5SUM="0a874ac3d109974de33cf10c9860b03f"
+DOWNLOAD="https://launchpad.net/veracrypt/trunk/1.26.7/+download/VeraCrypt_1.26.7_Source.tar.bz2"
+MD5SUM="014748dc89e9e31351cff984bc8b9386"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="wxGTK3 makeself"
+REQUIRES="wxWidgets makeself"
 MAINTAINER="Thomas Szteliga"
 EMAIL="ts@websafe.pl"
diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild
index 38aa08d8c5a..1a47be3e2ca 100644
--- a/system/vice/vice.SlackBuild
+++ b/system/vice/vice.SlackBuild
@@ -166,14 +166,14 @@ config() {
   # at all.
 
   # 20230504 bkw: note to self: -w means disable all warnings.
-  CFLAGS="$SLKCFLAGS -w -fcommon" \
+  CFLAGS="$SLKCFLAGS -w -fcommon -fpermissive" \
   CXXFLAGS="$SLKCFLAGS" \
   DOS2UNIX=/bin/true \
   XA=/bin/true \
   XDG_DESKTOP_MENU=/bin/true \
   ./configure \
     $configarg \
-    $ffmpeg \
+    --disable-ffmpeg \
     $pulseopt \
     --enable-html-docs \
     --enable-platformdox \
diff --git a/system/vinterm/includes.diff b/system/vinterm/includes.diff
new file mode 100644
index 00000000000..28b9096c597
--- /dev/null
+++ b/system/vinterm/includes.diff
@@ -0,0 +1,10 @@
+--- vinterm-0.5.0/terminal/pty.h	2013-08-20 01:34:06.000000000 +0900
++++ vinterm-0.5.0.patched/terminal/pty.h	2023-07-01 09:41:53.057899502 +0900
+@@ -3,6 +3,7 @@
+ 
+ #include 
+ #include 
++#include 
+ using namespace std;
+ 
+ class Options;
diff --git a/system/vinterm/vinterm.SlackBuild b/system/vinterm/vinterm.SlackBuild
index 05afe5718cc..5d88b5236d4 100644
--- a/system/vinterm/vinterm.SlackBuild
+++ b/system/vinterm/vinterm.SlackBuild
@@ -15,7 +15,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=vinterm
 VERSION=${VERSION:-0.5.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -66,6 +66,8 @@ sed -i -e "s,-Os,$SLKCFLAGS," -e "s,usr/lib,usr/lib$LIBDIRSUFFIX," config.mk
 
 # GRR. "make install" respects DESTDIR... except for the icons and .desktop.
 patch -p1 < $CWD/fix_destdir.diff
+# Add an include statement for GCC compatibility.
+patch -p1 < $CWD/includes.diff
 
 export TERMINFO=$PKG/usr/share/terminfo
 mkdir -p $TERMINFO
diff --git a/system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch b/system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch
new file mode 100644
index 00000000000..46c708b9d34
--- /dev/null
+++ b/system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch
@@ -0,0 +1,36 @@
+https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/117.patch
+https://bugs.gentoo.org/831963
+
+From 41cc016278e713d3db156761fce6437dff81a53a Mon Sep 17 00:00:00 2001
+From: Michal Vasilek 
+Date: Sat, 22 Jan 2022 23:28:20 +0100
+Subject: [PATCH] meson: fix build with meson 0.61
+
+i18n.merge_file doesn't accept positional arguments
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ if host_machine.system() != 'windows'
+   desktop = 'remote-viewer.desktop'
+ 
+   i18n.merge_file (
+-    desktop,
+     type: 'desktop',
+     input: desktop + '.in',
+     output: desktop,
+@@ -14,7 +13,6 @@ if host_machine.system() != 'windows'
+   mimetypes = 'virt-viewer-mime.xml'
+ 
+   i18n.merge_file (
+-    mimetypes,
+     type: 'xml',
+     input: mimetypes + '.in',
+     output: mimetypes,
+@@ -27,7 +25,6 @@ if host_machine.system() != 'windows'
+   metainfo = 'remote-viewer.appdata.xml'
+ 
+   i18n.merge_file (
+-    metainfo,
+     type: 'xml',
+     input: metainfo + '.in',
+     output: metainfo,
+GitLab
diff --git a/system/virt-viewer/virt-viewer.SlackBuild b/system/virt-viewer/virt-viewer.SlackBuild
index c0601c673fa..01d6ef50681 100644
--- a/system/virt-viewer/virt-viewer.SlackBuild
+++ b/system/virt-viewer/virt-viewer.SlackBuild
@@ -68,6 +68,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch -p1 < $CWD/virt-viewer-10.0_p20210730-meson-0.61.patch
+
 mkdir build
 cd build
   CFLAGS="$SLKCFLAGS" \
diff --git a/system/virtiofsd/README b/system/virtiofsd/README
new file mode 100644
index 00000000000..45d12f25266
--- /dev/null
+++ b/system/virtiofsd/README
@@ -0,0 +1,19 @@
+virtiofsd is a vhost-user virtio-fs device backend written in Rust.
+
+This won't work on a 32bit operating system.
+
+NOTE: if you wish to update virtiofsd yourself you need to create a
+tarball first with the vendored versions of the rust dependencies:
+to create the "vendor" source dir yourself unpack the virtiofsd
+tarball, enter its directory and execute these three commands
+
+  export LD_LIBRARY_PATH="/opt/rust16/lib64:$LD_LIBRARY_PATH"
+  export PATH="/opt/rust16/bin:$PATH"
+  cargo vendor
+
+then you can create a tarball with
+
+  tar Jcf ../virtiofsd-vendor-$VERSION.tar.xz vendor
+
+this is necessary to avoid downloading stuff during execution of
+the SlackBuild.
diff --git a/python/gi-docgen/slack-desc b/system/virtiofsd/slack-desc
similarity index 64%
rename from python/gi-docgen/slack-desc
rename to system/virtiofsd/slack-desc
index 14f602d26d5..a1e87c22f02 100644
--- a/python/gi-docgen/slack-desc
+++ b/system/virtiofsd/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
          |-----handy-ruler------------------------------------------------------|
-gi-docgen: gi-docgen (Document Generator)
-gi-docgen:
-gi-docgen: GI-DocGen is a document generator for GObject-based libraries.
-gi-docgen:
-gi-docgen: Homepage: https://gnome.pages.gitlab.gnome.org/gi-docgen
-gi-docgen:
-gi-docgen:
-gi-docgen:
-gi-docgen:
-gi-docgen:
-gi-docgen:
+virtiofsd: virtiofsd (vhost-user virtio-fs device backend)
+virtiofsd:
+virtiofsd: virtiofsd is a vhost-user virtio-fs device backend written in Rust.
+virtiofsd:
+virtiofsd: homepage: https://virtio-fs.gitlab.io
+virtiofsd:
+virtiofsd:
+virtiofsd:
+virtiofsd:
+virtiofsd:
+virtiofsd:
diff --git a/python/gi-docgen/gi-docgen.SlackBuild b/system/virtiofsd/virtiofsd.SlackBuild
similarity index 68%
rename from python/gi-docgen/gi-docgen.SlackBuild
rename to system/virtiofsd/virtiofsd.SlackBuild
index a6fc4d340a5..fa42211bc3f 100644
--- a/python/gi-docgen/gi-docgen.SlackBuild
+++ b/system/virtiofsd/virtiofsd.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-# Slackware build script for gi-docgen
+# Slackware build script for virtiofsd
 
-# Copyright 2022-2023 Steven Voges 
+# Copyright 2023-2024 Matteo Bernardini , Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,17 +24,17 @@
 
 cd $(dirname $0) ; CWD=$(pwd)
 
-PRGNAM=gi-docgen
-VERSION=${VERSION:-2023.1}
+PRGNAM=virtiofsd
+VERSION=${VERSION:-1.10.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
+    x86_64) ARCH=x86_64 ;;
+#      arm*) ARCH=arm ;;
+         *) echo "ARCH $(uname -m) is unsupported."; exit 1 ;;
   esac
 fi
 
@@ -48,16 +48,12 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
@@ -66,9 +62,10 @@ 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
+rm -rf $PRGNAM-v$VERSION
+tar xvf $CWD/$PRGNAM-v$VERSION.tar.?z*
+cd $PRGNAM-v$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION-vendor.tar.xz
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -76,19 +73,28 @@ 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 {} \;
 
-python3 setup.py install --root=$PKG
-mv $PKG/usr/share/man $PKG/usr/man
+export PATH="/opt/rust16/bin:$PATH"
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX"
+else
+  export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
+fi
+
+mkdir .cargo
+cat <>.cargo/config.toml
+[source.crates-io]
+replace-with = "vendored-sources"
 
-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
+[source.vendored-sources]
+directory = "vendor"
+EOT
 
-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
+cargo build --release
+install -D -p -s -m 0755 target/release/$PRGNAM $PKG/usr/libexec/$PRGNAM
+install -D -p -m 0644 50-virtiofsd.json $PKG/usr/share/qemu/vhost-user/50-virtiofsd.json
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  *.md LICENSES/*.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.md doc/*.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/virtiofsd/virtiofsd.info b/system/virtiofsd/virtiofsd.info
new file mode 100644
index 00000000000..4f10e98319e
--- /dev/null
+++ b/system/virtiofsd/virtiofsd.info
@@ -0,0 +1,12 @@
+PRGNAM="virtiofsd"
+VERSION="1.10.1"
+HOMEPAGE="https://virtio-fs.gitlab.io"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://gitlab.com/virtio-fs/virtiofsd/-/archive/v1.10.1/virtiofsd-v1.10.1.tar.bz2 \
+                 https://ponce.cc/slackware/sources/repo/virtiofsd-1.10.1-vendor.tar.xz"
+MD5SUM_x86_64="c6fd3f5b7a83c908f9e08127ec92edc6 \
+               d4538be9ccd5f48561e9dc5d98981eb6"
+REQUIRES="rust16"
+MAINTAINER="Matteo Bernardini"
+EMAIL="ponce@slackbuilds.org"
diff --git a/system/virtualbox-addons/gcc13.patch b/system/virtualbox-addons/gcc13.patch
new file mode 100644
index 00000000000..40701d717f8
--- /dev/null
+++ b/system/virtualbox-addons/gcc13.patch
@@ -0,0 +1,11 @@
+--- Config.kmk.orig     2023-04-13 03:15:13.000000000 -0600
++++ Config.kmk  2023-06-16 09:59:19.820597642 -0600
+@@ -7485,7 +7485,7 @@
+  TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64   = -m elf_x86_64
+ endif
+ TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS  = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-pie -fno-merge-constants -std=c99 -ffreestanding
+-TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-pie -fno-merge-constants -ffreestanding
++TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-pie -fno-merge-constants
+ TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS.linux  = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h
+ TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS.linux = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h
+ TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o
diff --git a/system/virtualbox-addons/virtualbox-addons.SlackBuild b/system/virtualbox-addons/virtualbox-addons.SlackBuild
index 298cb1ef80b..d2445314c4c 100644
--- a/system/virtualbox-addons/virtualbox-addons.SlackBuild
+++ b/system/virtualbox-addons/virtualbox-addons.SlackBuild
@@ -89,6 +89,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 -p0 < $CWD/gcc13.patch
+
 ./configure \
   --only-additions \
   --disable-kmods \
diff --git a/system/virtualbox-kernel/kernel-6.9.patch b/system/virtualbox-kernel/kernel-6.9.patch
new file mode 100644
index 00000000000..5f0d63af386
--- /dev/null
+++ b/system/virtualbox-kernel/kernel-6.9.patch
@@ -0,0 +1,73 @@
+diff -Naur virtualbox-kernel-6.1.50.orig/vboxdrv/r0drv/linux/memobj-r0drv-linux.c virtualbox-kernel-6.1.50/vboxdrv/r0drv/linux/memobj-r0drv-linux.c
+--- virtualbox-kernel-6.1.50.orig/vboxdrv/r0drv/linux/memobj-r0drv-linux.c	2024-02-28 16:14:23.000000000 +0100
++++ virtualbox-kernel-6.1.50/vboxdrv/r0drv/linux/memobj-r0drv-linux.c	2024-06-20 10:07:05.741540749 +0200
+@@ -1078,7 +1078,7 @@
+     u.Four  = *p4d_offset(&u.Global, ulAddr);
+     if (RT_UNLIKELY(p4d_none(u.Four)))
+         return NULL;
+-    if (p4d_large(u.Four))
++    if (p4d_leaf(u.Four))
+     {
+         pPage = p4d_page(u.Four);
+         AssertReturn(pPage, NULL);
+@@ -1094,7 +1094,7 @@
+     if (RT_UNLIKELY(pud_none(u.Upper)))
+         return NULL;
+ # if RTLNX_VER_MIN(2,6,25)
+-    if (pud_large(u.Upper))
++    if (pud_leaf(u.Upper))
+     {
+         pPage = pud_page(u.Upper);
+         AssertReturn(pPage, NULL);
+@@ -1110,7 +1110,7 @@
+     if (RT_UNLIKELY(pmd_none(u.Middle)))
+         return NULL;
+ #if RTLNX_VER_MIN(2,6,0)
+-    if (pmd_large(u.Middle))
++    if (pmd_leaf(u.Middle))
+     {
+         pPage = pmd_page(u.Middle);
+         AssertReturn(pPage, NULL);
+diff -Naur virtualbox-kernel-6.1.50.orig/vboxnetflt/linux/VBoxNetFlt-linux.c virtualbox-kernel-6.1.50/vboxnetflt/linux/VBoxNetFlt-linux.c
+--- virtualbox-kernel-6.1.50.orig/vboxnetflt/linux/VBoxNetFlt-linux.c	2024-02-28 16:14:23.000000000 +0100
++++ virtualbox-kernel-6.1.50/vboxnetflt/linux/VBoxNetFlt-linux.c	2024-06-20 10:07:53.820540749 +0200
+@@ -156,6 +156,17 @@
+ # endif
+ #endif
+ 
++#if RTLNX_VER_MIN(6,9,0)
++# define VBOX_SKB_FRAG_LEN(_pFrag)       ((_pFrag)->len)
++# define VBOX_SKB_FRAG_OFFSET(_pFrag)    ((_pFrag)->offset)
++#elif RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2)
++# define VBOX_SKB_FRAG_LEN(_pFrag)       ((_pFrag)->bv_len)
++# define VBOX_SKB_FRAG_OFFSET(_pFrag)    ((_pFrag)->bv_offset)
++#else /* < KERNEL_VERSION(5, 4, 0) */
++# define VBOX_SKB_FRAG_LEN(_pFrag)       ((_pFrag)->size)
++# define VBOX_SKB_FRAG_OFFSET(_pFrag)    ((_pFrag)->page_offset)
++#endif /* > KERNEL_VERSION(6, 9, 0) */
++
+ #if RTLNX_VER_MIN(3,20,0) || RTLNX_RHEL_RANGE(7,2,  8,0) || RTLNX_RHEL_RANGE(6,8,  7,0)
+ # define VBOX_HAVE_SKB_VLAN
+ #endif
+@@ -918,8 +929,8 @@
+     {
+         skb_frag_t *pFrag = &skb_shinfo(pBuf)->frags[i];
+ # if RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2)
+-        pSG->aSegs[iSeg].cb = pFrag->bv_len;
+-        pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset;
++        pSG->aSegs[iSeg].cb = VBOX_SKB_FRAG_LEN(pFrag);
++        pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + VBOX_SKB_FRAG_OFFSET(pFrag);
+ # else /* < KERNEL_VERSION(5, 4, 0) */
+         pSG->aSegs[iSeg].cb = pFrag->size;
+         pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->page_offset;
+@@ -939,8 +950,8 @@
+         {
+             skb_frag_t *pFrag = &skb_shinfo(pFragBuf)->frags[i];
+ # if RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2)
+-            pSG->aSegs[iSeg].cb = pFrag->bv_len;
+-            pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset;
++            pSG->aSegs[iSeg].cb = VBOX_SKB_FRAG_LEN(pFrag);
++            pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + VBOX_SKB_FRAG_OFFSET(pFrag);
+ # else /* < KERNEL_VERSION(5, 4, 0) */
+             pSG->aSegs[iSeg].cb = pFrag->size;
+             pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->page_offset;
diff --git a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild
index bc2d979b041..0b3e8930d0b 100644
--- a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild
+++ b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild
@@ -75,6 +75,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/kernel-6.9.patch
+
 # Fix compatibility with 5.18.x
 sed -i "s|netif_rx_ni|netif_rx|g" vboxnetflt/linux/VBoxNetFlt-linux.c
 
diff --git a/system/virtualbox/virtualbox.SlackBuild b/system/virtualbox/virtualbox.SlackBuild
index e4c4d046392..56edf25e193 100644
--- a/system/virtualbox/virtualbox.SlackBuild
+++ b/system/virtualbox/virtualbox.SlackBuild
@@ -131,7 +131,7 @@ patch -p1 -i $CWD/006-rdesktop-vrdp-keymap-path.patch
 sed -i 's|python2.7 python2.6 |python3.10 |' ./configure
 
 # Use our CFLAGS
-sed -i "s|CXX_FLAGS=\"\"|CXX_FLAGS=\"$SLKCFLAGS -std=c++11\"|" ./configure
+sed -i "s|CXX_FLAGS=\"\"|CXX_FLAGS=\"$SLKCFLAGS -std=c++11 -fpermissive\"|" ./configure
 
 ./configure \
   --disable-kmods \
@@ -147,7 +147,7 @@ sed -i "s|CXX_FLAGS=\"\"|CXX_FLAGS=\"$SLKCFLAGS -std=c++11\"|" ./configure
 
 cp $CWD/LocalConfig.kmk .
 sed -i "s|LIBDIR|lib$LIBDIRSUFFIX|" ./LocalConfig.kmk
-sed -i "s|CXXFLAGS|$SLKCFLAGS -std=c++11|" ./LocalConfig.kmk
+sed -i "s|CXXFLAGS|$SLKCFLAGS -std=c++11 -fpermissive|" ./LocalConfig.kmk
 
 kmk -j ${JOBS} LOCALCFG=./LocalConfig.kmk
 
diff --git a/system/xar/xar.SlackBuild b/system/xar/xar.SlackBuild
index 242854f5c96..ca6fb866490 100644
--- a/system/xar/xar.SlackBuild
+++ b/system/xar/xar.SlackBuild
@@ -109,6 +109,8 @@ ln -sf ../xar.h include/xar/xar.h
 # -I doesn't affect #include "blah.h".
 sed -i 's,"\(\(util\|filetree\)\.h\)",<\1>,' src/xar.c
 
+sed -i '/ext2fs\/ext2_fs/i #include ' lib/ext2.c
+
 # xar executable, library, and includes. have to manually add
 # openssl's libs, and jigger the include path for  and
 # .
diff --git a/system/xbindkeys/xbindkeys.SlackBuild b/system/xbindkeys/xbindkeys.SlackBuild
index 9d66578e8ef..9d033bda91c 100644
--- a/system/xbindkeys/xbindkeys.SlackBuild
+++ b/system/xbindkeys/xbindkeys.SlackBuild
@@ -79,6 +79,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 {} \;
 
+autoreconf -vif
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/system/xbindkeys/xbindkeys.info b/system/xbindkeys/xbindkeys.info
index 2856be18201..2621e201b05 100644
--- a/system/xbindkeys/xbindkeys.info
+++ b/system/xbindkeys/xbindkeys.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://www.nongnu.org/xbindkeys/xbindkeys-1.8.7.tar.gz"
 MD5SUM="b5e1a9668ba13ff8673836d1d965d951"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="guile2.2"
+REQUIRES=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
diff --git a/system/xboxdrv-linux/fix-60-sec-delay.patch b/system/xboxdrv-linux/fix-60-sec-delay.patch
deleted file mode 100644
index da543d2cfa0..00000000000
--- a/system/xboxdrv-linux/fix-60-sec-delay.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7326421eeaadbc2aeb3828628c2e65bb7be323a9 Mon Sep 17 00:00:00 2001
-From: buxit 
-Date: Wed, 2 Nov 2016 16:25:14 +0100
-Subject: [PATCH] fix 60 seconds delay
-
-use `libusb_handle_events_timeout_completed()` instead of `libusb_handle_events()`
-should fix #144
----
- src/usb_gsource.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/usb_gsource.cpp b/src/usb_gsource.cpp
-index 00bf1315..afb38f65 100644
---- a/src/usb_gsource.cpp
-+++ b/src/usb_gsource.cpp
-@@ -174,7 +174,10 @@ USBGSource::on_source_dispatch(GSource* source, GSourceFunc callback, gpointer u
- gboolean
- USBGSource::on_source()
- {
--  libusb_handle_events(NULL);
-+  struct timeval to;
-+  to.tv_sec = 0;
-+  to.tv_usec = 0;
-+  libusb_handle_events_timeout_completed(NULL, &to, NULL);
-   return TRUE;
- }
- 
diff --git a/system/xboxdrv-linux/scons-py3.patch b/system/xboxdrv-linux/scons-py3.patch
deleted file mode 100644
index 4aa6fa61931..00000000000
--- a/system/xboxdrv-linux/scons-py3.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 17bd43a7d3ef86216abc36b42b4e6a1f70aa9979 Mon Sep 17 00:00:00 2001
-From: xnick 
-Date: Thu, 12 Oct 2017 20:34:35 +0300
-Subject: [PATCH] Update SConstruct
-
-python3 compatible
----
- SConstruct | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 4cd79704..c0007054 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -19,7 +19,7 @@ def build_dbus_glue(target, source, env):
-     xml = re.sub(r"callback = \(([A-Za-z_]+)\) \(marshal_data \? marshal_data : cc->callback\);",
-                  r"union { \1 fn; void* obj; } conv;\n  "
-                  "conv.obj = (marshal_data ? marshal_data : cc->callback);\n  "
--                 "callback = conv.fn;", xml)
-+                 "callback = conv.fn;", xml.decode('utf-8'))
- 
-     with open(target[0].get_path(), "w") as f:
-         f.write(xml)
-@@ -29,10 +29,10 @@ def build_bin2h(target, source, env):
-     Takes a list of files and converts them into a C source that can be included
-     """
-     def c_escape(str): 
--        return str.translate(string.maketrans("/.-", "___"))
-+        return str.translate(bytes.maketrans(b"/.-", b"___"))
-     
--    print target
--    print source
-+    print(target)
-+    print(source)
-     with open(target[0].get_path(), "w") as fout:
-         fout.write("// autogenerated by scons Bin2H builder, do not edit by hand!\n\n")
- 
-@@ -45,8 +45,8 @@ def build_bin2h(target, source, env):
-                 data = fin.read()
-                 fout.write("// \"%s\"\n" % src.get_path())
-                 fout.write("const char %s[] = {" % c_escape(src.get_path()))
--                bytes_arr = ["0x%02x" % ord(c) for c in data]
--                for i in xrange(len(bytes_arr)):
-+                bytes_arr = ["0x%02x" % c for c in data]
-+                for i in range(len(bytes_arr)):
-                     if i % 13 == 0:
-                         fout.write("\n  ")
-                     fout.write(bytes_arr[i])
-@@ -131,12 +131,12 @@ env.Append(CPPDEFINES = { 'PACKAGE_VERSION': "'\"%s\"'" % package_version })
- conf = Configure(env)
- 
- if not conf.env['CXX']:
--    print "g++ must be installed!"
-+    print('g++ must be installed!')
-     Exit(1)
- 
- # X11 checks
- if not conf.CheckLibWithHeader('X11', 'X11/Xlib.h', 'C++'):
--    print 'libx11-dev must be installed!'
-+    print('libx11-dev must be installed!')
-     Exit(1)
- 
- env = conf.Finish()
diff --git a/system/xboxdrv-linux/scons-v4.2.0.patch b/system/xboxdrv-linux/scons-v4.2.0.patch
deleted file mode 100644
index 04b05e8d6ff..00000000000
--- a/system/xboxdrv-linux/scons-v4.2.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/SConstruct	2021-10-31 20:42:44.232084185 -0400
-+++ b/SConstruct	2021-10-31 20:42:54.063024444 -0400
-@@ -36,7 +36,7 @@
-     with open(target[0].get_path(), "w") as fout:
-         fout.write("// autogenerated by scons Bin2H builder, do not edit by hand!\n\n")
- 
--        if env.has_key("BIN2H_NAMESPACE"):
-+        if "BIN2H_NAMESPACE" in env:
-             fout.write("namespace %s {\n\n" % env["BIN2H_NAMESPACE"])
-             
-         # write down data
-@@ -62,7 +62,7 @@
-                                     for src in source], ",\n"))
-             fout.write("\n}\n\n")
- 
--        if env.has_key("BIN2H_NAMESPACE"):
-+        if "BIN2H_NAMESPACE" in env:
-             fout.write("} // namespace %s\n\n" % env["BIN2H_NAMESPACE"])
-                 
-         fout.write("/* EOF */\n")
diff --git a/system/xboxdrv-linux/xboxdrv-linux.SlackBuild b/system/xboxdrv-linux/xboxdrv-linux.SlackBuild
index 731080f529f..6cce3b33c37 100644
--- a/system/xboxdrv-linux/xboxdrv-linux.SlackBuild
+++ b/system/xboxdrv-linux/xboxdrv-linux.SlackBuild
@@ -32,8 +32,9 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xboxdrv-linux
-VERSION=${VERSION:-0.8.8}
-BUILD=${BUILD:-3}
+SRCNAM=xboxdrv
+VERSION=${VERSION:-0.8.11}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -45,9 +46,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -76,14 +74,9 @@ 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
-# thanks arch maintainers
-patch -p1 < "$CWD/fix-60-sec-delay.patch"
-patch -p1 < "$CWD/scons-py3.patch"
-patch -p1 < "$CWD/scons-v4.2.0.patch"
-patch -p1 < "$CWD/xboxdrvctl-py3.patch"
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/system/xboxdrv-linux/xboxdrv-linux.info b/system/xboxdrv-linux/xboxdrv-linux.info
index fb8f4aecaea..c1d328c56d0 100644
--- a/system/xboxdrv-linux/xboxdrv-linux.info
+++ b/system/xboxdrv-linux/xboxdrv-linux.info
@@ -1,8 +1,8 @@
 PRGNAM="xboxdrv-linux"
-VERSION="0.8.8"
-HOMEPAGE="https://xboxdrv.gitlab.io/"
-DOWNLOAD="https://xboxdrv.gitlab.io/xboxdrv-linux-0.8.8.tar.bz2"
-MD5SUM="a62703eda7d59393538b2f22d5b0c791"
+VERSION="0.8.11"
+HOMEPAGE="https://github.com/xiota/xboxdrv"
+DOWNLOAD="https://github.com/xiota/xboxdrv/archive/v0.8.11/xboxdrv-0.8.11.tar.gz"
+MD5SUM="982458c2236be19d47f907ea50ad1fca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/xboxdrv-linux/xboxdrvctl-py3.patch b/system/xboxdrv-linux/xboxdrvctl-py3.patch
deleted file mode 100644
index 71d8762cb9c..00000000000
--- a/system/xboxdrv-linux/xboxdrvctl-py3.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- a/xboxdrvctl	2021-06-21 19:39:51.000000000 -0400
-+++ b/xboxdrvctl 19:43:27.467984928 -0400
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2
-+#!/usr/bin/env python3
- 
- ##  Xbox360 USB Gamepad Userspace Driver
- ##  Copyright (C) 2011 Ingo Ruhnke 
-@@ -37,23 +37,23 @@
-                   help="print controller status")
- 
- group.add_option("-s", "--slot", metavar="SLOT", type="int",
--                  dest="slot", 
-+                  dest="slot",
-                   help="use slot SLOT for actions")
- 
- group.add_option("-l", "--led", metavar="NUM", type="int",
--                  dest="led", 
-+                  dest="led",
-                   help="set LED")
- 
--group.add_option("-r", "--rumble", metavar="L:R", 
--                  dest="rumble", 
-+group.add_option("-r", "--rumble", metavar="L:R",
-+                  dest="rumble",
-                   help="print controller status")
- 
- group.add_option("-c", "--config", metavar="NUM", type="int",
--                  dest="config", 
-+                  dest="config",
-                   help="switches to controller configuration NUM")
- 
- group.add_option("--shutdown", action="store_true",
--                  dest="shutdown", 
-+                  dest="shutdown",
-                   help="shuts down the daemon")
- 
- parser.add_option_group(group)
-@@ -69,9 +69,9 @@
-     try:
-         bus.get_object("org.seul.Xboxdrv", '/org/seul/Xboxdrv/Daemon')
-     except dbus.exceptions.DBusException:
--				bus = dbus.SystemBus()
-+        bus = dbus.SystemBus()
- else:
--    print "Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'"
-+    print("Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'")
-     exit()
- 
- if options.status:
-@@ -82,19 +82,19 @@
-     daemon.Shutdown()
- else:
-     if (options.led or options.rumble or options.config) and options.slot == None:
--        print "Error: --slot argument required"
-+        print("Error: --slot argument required")
-         exit()
-     else:
-         if options.slot != None:
-             slot = bus.get_object("org.seul.Xboxdrv", '/org/seul/Xboxdrv/ControllerSlots/%d' % options.slot)
--    
-+
-             if options.led != None:
-                 slot.SetLed(options.led)
- 
-             if options.rumble:
-                 m = re.match('^(\d+):(\d+)$', options.rumble)
-                 if not m:
--                    print "Error: invalid argument to --rumble"
-+                    print("Error: invalid argument to --rumble")
-                     exit()
-                 else:
-                     left  = int(m.group(1))