diff options
Diffstat (limited to 'source/l')
314 files changed, 8456 insertions, 1902 deletions
diff --git a/source/l/GConf/GConf.SlackBuild b/source/l/GConf/GConf.SlackBuild index a8f8962a0..399a92ce9 100755 --- a/source/l/GConf/GConf.SlackBuild +++ b/source/l/GConf/GConf.SlackBuild @@ -60,6 +60,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP diff --git a/source/l/Imath/Imath.SlackBuild b/source/l/Imath/Imath.SlackBuild index 9e7657210..2fbf6e962 100755 --- a/source/l/Imath/Imath.SlackBuild +++ b/source/l/Imath/Imath.SlackBuild @@ -32,7 +32,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -52,14 +52,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/LibRaw/LibRaw.SlackBuild b/source/l/LibRaw/LibRaw.SlackBuild index cccdcacad..c2ba6db93 100755 --- a/source/l/LibRaw/LibRaw.SlackBuild +++ b/source/l/LibRaw/LibRaw.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2013, 2015, 2016, 2018, 2023 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2013, 2015, 2016, 2018, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA # Copyright 2013 Eric Hameleers, Eindhoven, NL # All rights reserved. @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=LibRaw VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -33,8 +33,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$MARCH ;; @@ -49,18 +48,12 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -77,9 +70,7 @@ PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PKGNAM-$VERSION-build -mkdir $PKGNAM-$VERSION-build -cd $PKGNAM-$VERSION-build +rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 diff --git a/source/l/M2Crypto/M2Crypto.SlackBuild b/source/l/M2Crypto/M2Crypto.SlackBuild index dc4f2ee51..0d46f934f 100755 --- a/source/l/M2Crypto/M2Crypto.SlackBuild +++ b/source/l/M2Crypto/M2Crypto.SlackBuild @@ -24,13 +24,14 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=M2Crypto -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +SRCNAM=m2crypto +VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -51,9 +52,9 @@ PKG=${PKG:-$TMP/package-M2Crypto} rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf M2Crypto-$VERSION -tar xvf $CWD/M2Crypto-$VERSION.tar.?z || exit 1 -cd M2Crypto-$VERSION || exit 1 +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 +cd $SRCNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/l/M2Crypto/M2Crypto.url b/source/l/M2Crypto/m2crypto.url index 637707c23..637707c23 100644 --- a/source/l/M2Crypto/M2Crypto.url +++ b/source/l/M2Crypto/m2crypto.url diff --git a/source/l/PyQt-builder/PyQt-builder.SlackBuild b/source/l/PyQt-builder/PyQt-builder.SlackBuild index 740f0f883..4636f9459 100755 --- a/source/l/PyQt-builder/PyQt-builder.SlackBuild +++ b/source/l/PyQt-builder/PyQt-builder.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2023 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,16 +23,16 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=PyQt-builder -SRCNAM=PyQt-builder +SRCNAM=pyqt_builder VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -51,9 +51,9 @@ fi if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" elif [ "$ARCH" = "armv7hl" ]; then SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" else @@ -84,6 +84,10 @@ python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# Remove Windows garbage: +find $PKG . -name "*.exe" -exec rm -f "{}" \; +find $PKG . -name "*.dll" -exec rm -f "{}" \; + mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ LICENSE* COPYING* ChangeLog NEWS README TODO doc/* \ diff --git a/source/l/PyQt5/PyQt5.SlackBuild b/source/l/PyQt5/PyQt5.SlackBuild index f9f608fa2..b5035cd21 100755 --- a/source/l/PyQt5/PyQt5.SlackBuild +++ b/source/l/PyQt5/PyQt5.SlackBuild @@ -33,7 +33,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -41,17 +41,14 @@ if [ -z "$ARCH" ]; then export ARCH fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then +if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" elif [ "$ARCH" = "armv7hl" ]; then SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" diff --git a/source/l/PyQt5_sip/PyQt5_sip.SlackBuild b/source/l/PyQt5_sip/PyQt5_sip.SlackBuild index f1872be12..3502d3286 100755 --- a/source/l/PyQt5_sip/PyQt5_sip.SlackBuild +++ b/source/l/PyQt5_sip/PyQt5_sip.SlackBuild @@ -29,14 +29,14 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=PyQt5_sip SRCNAM=PyQt5_sip VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -55,15 +55,19 @@ fi if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" elif [ "$ARCH" = "armv7hl" ]; then SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" else SLKCFLAGS="-O2" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" +export CFLAGS="$SLKCFLAGS" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/l/QScintilla/QScintilla.SlackBuild b/source/l/QScintilla/QScintilla.SlackBuild index 98b08390b..f3a8c20c8 100755 --- a/source/l/QScintilla/QScintilla.SlackBuild +++ b/source/l/QScintilla/QScintilla.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=QScintilla SRCNAM=QScintilla_src VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/SDL2/SDL2.SlackBuild b/source/l/SDL2/SDL2.SlackBuild index 342626290..7fd275291 100755 --- a/source/l/SDL2/SDL2.SlackBuild +++ b/source/l/SDL2/SDL2.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -47,21 +47,12 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/SDL2/SDL2.url b/source/l/SDL2/SDL2.url index 6f063ccde..91821b3a9 100644 --- a/source/l/SDL2/SDL2.url +++ b/source/l/SDL2/SDL2.url @@ -1,2 +1,2 @@ https://github.com/libsdl-org/SDL -https://github.com/libsdl-org/SDL/releases/download/release-2.30.1/SDL2-2.30.1.tar.gz +https://github.com/libsdl-org/SDL/releases/download/release-2.30.7/SDL2-2.30.7.tar.gz diff --git a/source/l/aalib/aalib.SlackBuild b/source/l/aalib/aalib.SlackBuild index 4e1ff6e3b..6fde3f4f4 100755 --- a/source/l/aalib/aalib.SlackBuild +++ b/source/l/aalib/aalib.SlackBuild @@ -84,6 +84,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int" + # Configure: CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/source/l/abseil-cpp/abseil-cpp.SlackBuild b/source/l/abseil-cpp/abseil-cpp.SlackBuild index 6523fff5b..dbe1d8348 100755 --- a/source/l/abseil-cpp/abseil-cpp.SlackBuild +++ b/source/l/abseil-cpp/abseil-cpp.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -47,21 +47,12 @@ fi NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy.SlackBuild b/source/l/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy.SlackBuild new file mode 100755 index 000000000..6ecf9d94a --- /dev/null +++ b/source/l/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy.SlackBuild @@ -0,0 +1,149 @@ +#!/bin/bash + +# Copyright 2024 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=adwaita-icon-theme-legacy +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +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 "$PKGNAM-$VERSION-noarch-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$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 {} \+ + +# 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 \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --buildtype=release \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. + +# Add some extra icons that are missing for Xfce. +# Copy from the main tree and back to make sure that we +# don't overwrite these if they eventally appear. +( cd $PKG + mkdir tmpicons + cd tmpicons + tar xf $CWD/adwaita-xfce-icons-0.6.tar.xz + rm -f README + mv usr/share/icons/Adwaita usr/share/icons/AdwaitaLegacy + rsync -lprvt --progress ../usr/ usr/ + # Then sync back: + rsync -lprvt --progress usr/ ../usr/ + # And remove the leftovers: + cd .. + rm -r tmpicons +) + +# It's a bad idea to ship these in the packages. If they aren't kept +# updated, there will be missing icons. Let the user create them if +# they care to. +find $PKG -name icon-theme.cache -exec rm "{}" \+ +find $PKG -name .icon-theme.cache -exec rm "{}" \; +find $PKG -name .placeholder -exec rm "{}" \; +find $PKG -name .empty -exec rm "{}" \; + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + COPYING* NEWS* README* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +mv $PKG/usr/share/licenses/*/* $PKG/usr/doc/$PKGNAM-$VERSION +rm -rf $PKG/usr/share/licenses + +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-noarch-$BUILD.txz diff --git a/source/l/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy.url b/source/l/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy.url new file mode 100644 index 000000000..a18ce55fc --- /dev/null +++ b/source/l/adwaita-icon-theme-legacy/adwaita-icon-theme-legacy.url @@ -0,0 +1 @@ +https://gitlab.gnome.org/jimmac/adwaita-icon-theme-legacy diff --git a/source/l/adwaita-icon-theme-legacy/doinst.sh b/source/l/adwaita-icon-theme-legacy/doinst.sh new file mode 100644 index 000000000..be9e95b4f --- /dev/null +++ b/source/l/adwaita-icon-theme-legacy/doinst.sh @@ -0,0 +1,6 @@ +if [ -e /usr/share/icons/AdwaitaLegacy/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache /usr/share/icons/AdwaitaLegacy 1> /dev/null 2> /dev/null + fi +fi + diff --git a/source/l/adwaita-icon-theme-legacy/fetch-adwaita-icon-theme-legacy.sh b/source/l/adwaita-icon-theme-legacy/fetch-adwaita-icon-theme-legacy.sh new file mode 100755 index 000000000..9c6307ea4 --- /dev/null +++ b/source/l/adwaita-icon-theme-legacy/fetch-adwaita-icon-theme-legacy.sh @@ -0,0 +1,52 @@ +#!/bin/sh + +# Copyright 2024 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. + + +PKGNAM=adwaita-icon-theme-legacy + +# Pull a stable branch + patches +BRANCH=${1:-master} + +# Clear download area: +rm -rf ${PKGNAM} + +# Clone repository: +git clone https://gitlab.gnome.org/jimmac/adwaita-icon-theme-legacy + +# checkout $BRANCH: +( cd ${PKGNAM} + git checkout $BRANCH || exit 1 +) + +HEADISAT="$( cd ${PKGNAM} && git log -1 --format=%h )" +DATE="$( cd ${PKGNAM} && git log -1 --format=%cd --date=format:%Y%m%d )" +LONGDATE="$( cd ${PKGNAM} && git log -1 --format=%cd --date=format:%c )" +# Cleanup. We're not packing up the whole git repo. +( cd ${PKGNAM} && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null ) +mv ${PKGNAM} ${PKGNAM}-${DATE}_${HEADISAT} +tar cf ${PKGNAM}-${DATE}_${HEADISAT}.tar ${PKGNAM}-${DATE}_${HEADISAT} +plzip -9 -f ${PKGNAM}-${DATE}_${HEADISAT}.tar +rm -rf ${PKGNAM}-${DATE}_${HEADISAT} +touch -d "$LONGDATE" ${PKGNAM}-${DATE}_${HEADISAT}.tar.lz +echo +echo "${PKGNAM} branch $BRANCH with HEAD at $HEADISAT packaged as ${PKGNAM}-${DATE}_${HEADISAT}.tar.lz" +echo diff --git a/source/l/adwaita-icon-theme-legacy/slack-desc b/source/l/adwaita-icon-theme-legacy/slack-desc new file mode 100644 index 000000000..4912be9ed --- /dev/null +++ b/source/l/adwaita-icon-theme-legacy/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 ':'. + + |-----handy-ruler------------------------------------------------------| +adwaita-icon-theme-legacy: adwaita-icon-theme-legacy (fallback icons from old Adwaita theme) +adwaita-icon-theme-legacy: +adwaita-icon-theme-legacy: AdwaitaLegacy theme that provides fallback icons that have been +adwaita-icon-theme-legacy: removed from the main Adwaita theme. +adwaita-icon-theme-legacy: +adwaita-icon-theme-legacy: Homepage: https://gitlab.gnome.org/jimmac/adwaita-icon-theme-legacy +adwaita-icon-theme-legacy: +adwaita-icon-theme-legacy: +adwaita-icon-theme-legacy: +adwaita-icon-theme-legacy: +adwaita-icon-theme-legacy: diff --git a/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild b/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild index 27350f954..2dc2570eb 100755 --- a/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild +++ b/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2012, 2013, 2018, 2023 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012, 2013, 2018, 2023, 2024 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -31,7 +31,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -92,23 +92,13 @@ meson setup \ DESTDIR=$PKG $NINJA install || exit 1 cd .. -# Add some extra icons that are missing for Xfce. -# Copy from the main tree and back to make sure that we -# don't overwrite these if they eventally appear. -( cd $PKG - mkdir tmpicons - cd tmpicons - tar xf $CWD/adwaita-xfce-icons-0.6.tar.xz - rm -f README - rsync -lprvt --progress ../usr/ usr/ - # Then sync back: - rsync -lprvt --progress usr/ ../usr/ - # And remove the leftovers: - cd .. - rm -r tmpicons -) - +# It's a bad idea to ship these in the packages. If they aren't kept +# updated, there will be missing icons. Let the user create them if +# they care to. +find $PKG -name icon-theme.cache -exec rm "{}" \+ find $PKG -name .icon-theme.cache -exec rm "{}" \; +find $PKG -name .placeholder -exec rm "{}" \; +find $PKG -name .empty -exec rm "{}" \; mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ @@ -119,10 +109,8 @@ if [ -r ChangeLog ]; then touch -r ChangeLog $PKG/usr/doc/$PKGNAM/ChangeLog fi -# It's a bad idea to ship these in the packages. If they aren't kept -# updated, there will be missing icons. Let the user create them if -# they care to. -find $PKG -name icon-theme.cache -exec rm "{}" \+ +mv $PKG/usr/share/licenses/*/* $PKG/usr/doc/$PKGNAM-$VERSION +rm -rf $PKG/usr/share/licenses mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc @@ -130,4 +118,3 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-noarch-$BUILD.txz - diff --git a/source/l/alsa-plugins/alsa-plugins.SlackBuild b/source/l/alsa-plugins/alsa-plugins.SlackBuild index dc83faeba..ffe166590 100755 --- a/source/l/alsa-plugins/alsa-plugins.SlackBuild +++ b/source/l/alsa-plugins/alsa-plugins.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=alsa-plugins VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -35,22 +35,18 @@ PKG=$TMP/package-$PKGNAM MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$MARCH ;; esac fi -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/aom/aom.SlackBuild b/source/l/aom/aom.SlackBuild new file mode 100755 index 000000000..b56ea9d40 --- /dev/null +++ b/source/l/aom/aom.SlackBuild @@ -0,0 +1,123 @@ +#!/bin/bash + +# Copyright 2018-2023 Andrew Strong, Blue Mountains, Australia +# Copyright 2024 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=aom +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i686 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$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 {} \+ + +# Configure, build, and install: +mkdir cmake-build +cd cmake-build + cmake \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX="$LIBDIRSUFFIX" \ + -DDOC_INSTALL_DIR="doc" \ + -DENABLE_NASM=1 \ + -DENABLE_DOCS=0 \ + -DBUILD_SHARED_LIBS=1 \ + -DENABLE_TESTS=0 \ + .. || exit 1 + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd .. + +# No static libraries: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/lib*.a + +# 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 + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS* CHANGELOG* LICENSE* PATENTS* README* \ + doc/AlgorithmDescription* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a CHANGELOG file, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r CHANGELOG ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat CHANGELOG | head -n 1000 > $DOCSDIR/CHANGELOG + touch -r CHANGELOG $DOCSDIR/CHANGELOG +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/libclc/fetch-libclc.sh b/source/l/aom/fetch-aom.sh index 54023cbdf..66fdc3e05 100755 --- a/source/l/libclc/fetch-libclc.sh +++ b/source/l/aom/fetch-aom.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2017 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,30 +20,33 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=aom + # Pull a stable branch + patches -BRANCH=${1:-master} +BRANCH=${1:-3.10.0} # Clear download area: -rm -rf libclc +rm -rf ${PKGNAM} # Clone repository: -git clone http://llvm.org/git/libclc.git +git clone https://aomedia.googlesource.com/aom # checkout $BRANCH: -( cd libclc - git checkout $BRANCH || exit 1 +( cd ${PKGNAM} + git checkout v${BRANCH} || exit 1 ) -HEADISAT="$( cd libclc && git log -1 --format=%h )" -DATE="$( cd libclc && git log -1 --format=%cd --date=format:%Y%m%d )" -LONGDATE="$( cd libclc && git log -1 --format=%cd --date=format:%c )" +HEADISAT="$( cd ${PKGNAM} && git log -1 --format=%h )" +DATE="$( cd ${PKGNAM} && git log -1 --format=%cd --date=format:%Y%m%d )" +LONGDATE="$( cd ${PKGNAM} && git log -1 --format=%cd --date=format:%c )" # Cleanup. We're not packing up the whole git repo. -( cd libclc && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null ) -mv libclc libclc-${DATE}_${HEADISAT} -tar cf libclc-${DATE}_${HEADISAT}.tar libclc-${DATE}_${HEADISAT} -xz -9 -f libclc-${DATE}_${HEADISAT}.tar -rm -rf libclc-${DATE}_${HEADISAT} -touch -d "$LONGDATE" libclc-${DATE}_${HEADISAT}.tar.xz +( cd ${PKGNAM} && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null ) +mv ${PKGNAM} ${PKGNAM}-${BRANCH} +tar cf ${PKGNAM}-${BRANCH}.tar ${PKGNAM}-${BRANCH} +plzip -9 -f ${PKGNAM}-${BRANCH}.tar +rm -rf ${PKGNAM}-${BRANCH} +touch -d "$LONGDATE" ${PKGNAM}-${BRANCH}.tar.lz echo -echo "libclc branch $BRANCH with HEAD at $HEADISAT packaged as libclc-${DATE}_${HEADISAT}.tar.xz" +echo "${PKGNAM} branch $BRANCH with HEAD at $HEADISAT packaged as ${PKGNAM}-${BRANCH}.tar.lz" echo diff --git a/source/l/aom/slack-desc b/source/l/aom/slack-desc new file mode 100644 index 000000000..b87dcaf2a --- /dev/null +++ b/source/l/aom/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 ':'. + + |-----handy-ruler------------------------------------------------------| +aom: aom (AV1 video codec library) +aom: +aom: AOMedia Video 1 (AV1) is an open and royalty free video encoding +aom: format optimized for the Internet and the successor of VP9. aom is the +aom: reference encoder and decoder implementation published by the Alliance +aom: for Open Media. +aom: +aom: Homepage: https://aomedia.org/av1/ +aom: +aom: +aom: diff --git a/source/l/apr-util/apr-util.SlackBuild b/source/l/apr-util/apr-util.SlackBuild index f41d51986..87e0660b8 100755 --- a/source/l/apr-util/apr-util.SlackBuild +++ b/source/l/apr-util/apr-util.SlackBuild @@ -60,6 +60,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int" + TMP=${TMP:-/tmp} PKG=$TMP/package-apr-util @@ -84,7 +87,7 @@ CFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --with-apr=/usr \ --with-dbm=db44 \ - --with-berkeley-db \ + --with-berkeley-db=/usr \ --with-mysql=/usr \ --disable-util-dso \ --without-gdbm \ diff --git a/source/l/apr/apr.SlackBuild b/source/l/apr/apr.SlackBuild index 3a88f6850..0a693146c 100755 --- a/source/l/apr/apr.SlackBuild +++ b/source/l/apr/apr.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -46,14 +46,11 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/apr/apr.url b/source/l/apr/apr.url index dea6b4dc2..551a4a5e5 100644 --- a/source/l/apr/apr.url +++ b/source/l/apr/apr.url @@ -1,2 +1,2 @@ -http://www.apache.org/dist/apr/apr-1.7.4.tar.bz2 -http://www.apache.org/dist/apr/apr-1.7.4.tar.bz2.asc +http://www.apache.org/dist/apr/apr-1.7.5.tar.bz2 +http://www.apache.org/dist/apr/apr-1.7.5.tar.bz2.asc diff --git a/source/l/argon2/argon2.SlackBuild b/source/l/argon2/argon2.SlackBuild index 0e6fa6faf..f7ae62911 100755 --- a/source/l/argon2/argon2.SlackBuild +++ b/source/l/argon2/argon2.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2019, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2019, 2020, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,12 +24,12 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=argon2 VERSION=${VERSION:-$(echo *.tar.?z | cut -f 1 -d .)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -49,16 +49,16 @@ fi #NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686 -msse3" + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -msse3" + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" elif [ "$ARCH" = "armv7hl" ]; then SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" diff --git a/source/l/at-spi2-core/at-spi2-core.SlackBuild b/source/l/at-spi2-core/at-spi2-core.SlackBuild index 7bfd84a9d..eb08f94b2 100755 --- a/source/l/at-spi2-core/at-spi2-core.SlackBuild +++ b/source/l/at-spi2-core/at-spi2-core.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -49,14 +49,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/avahi/avahi.SlackBuild b/source/l/avahi/avahi.SlackBuild index c27585761..d0405efc1 100755 --- a/source/l/avahi/avahi.SlackBuild +++ b/source/l/avahi/avahi.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=avahi VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild index 66604a9e4..d61503fa1 100755 --- a/source/l/boost/boost.SlackBuild +++ b/source/l/boost/boost.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=boost VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d _)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} PKG_VERSION=$(echo $VERSION | tr _ .) # Leave this alone NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -39,8 +39,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$MARCH ;; @@ -55,18 +54,12 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic -DBOOST_STACKTRACE_LIBCXX_RUNTIME_MAY_CAUSE_MEMORY_LEAK=1" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/brotli/brotli.SlackBuild b/source/l/brotli/brotli.SlackBuild index 39aec12eb..e9543ac71 100755 --- a/source/l/brotli/brotli.SlackBuild +++ b/source/l/brotli/brotli.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=brotli VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/cairo/595.patch b/source/l/cairo/595.patch new file mode 100644 index 000000000..ed1056a0c --- /dev/null +++ b/source/l/cairo/595.patch @@ -0,0 +1,34 @@ +From f19e2fe080ddcfce93c8234a919fd882f3d63362 Mon Sep 17 00:00:00 2001 +From: Adrian Johnson <ajohnson@redneon.com> +Date: Fri, 13 Sep 2024 06:28:39 +0930 +Subject: [PATCH] cff: Don't fail if no local subs + +Fixes: #870 +--- + src/cairo-cff-subset.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c +index 076cb2b0a..8a7de0065 100644 +--- a/src/cairo-cff-subset.c ++++ b/src/cairo-cff-subset.c +@@ -952,9 +952,13 @@ cairo_cff_font_read_private_dict (cairo_cff_font_t *font, + decode_number (operand, nominal_width); + + num_subs = _cairo_array_num_elements (local_sub_index); +- *local_subs_used = _cairo_calloc_ab (num_subs, sizeof (cairo_bool_t)); +- if (unlikely (*local_subs_used == NULL)) +- return _cairo_error (CAIRO_STATUS_NO_MEMORY); ++ if (num_subs > 0) { ++ *local_subs_used = _cairo_calloc_ab (num_subs, sizeof (cairo_bool_t)); ++ if (unlikely (*local_subs_used == NULL)) ++ return _cairo_error (CAIRO_STATUS_NO_MEMORY); ++ } else { ++ *local_subs_used = NULL; ++ } + + if (num_subs < 1240) + *local_sub_bias = 107; +-- +GitLab + diff --git a/source/l/cairo/cairo.SlackBuild b/source/l/cairo/cairo.SlackBuild index 4dc3f3c25..e3926ce64 100755 --- a/source/l/cairo/cairo.SlackBuild +++ b/source/l/cairo/cairo.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -46,14 +46,11 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -76,6 +73,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Fix cups printing: +cat $CWD/595.patch | patch -p1 --verbose || exit 1 + # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" diff --git a/source/l/chmlib/chmlib.SlackBuild b/source/l/chmlib/chmlib.SlackBuild index 720e6ccad..0c60b57c3 100755 --- a/source/l/chmlib/chmlib.SlackBuild +++ b/source/l/chmlib/chmlib.SlackBuild @@ -64,6 +64,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP diff --git a/source/l/cryfs/cryfs.SlackBuild b/source/l/cryfs/cryfs.SlackBuild index 79dbd37cf..b6bd69947 100755 --- a/source/l/cryfs/cryfs.SlackBuild +++ b/source/l/cryfs/cryfs.SlackBuild @@ -25,12 +25,12 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cryfs VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-10} +BUILD=${BUILD:-12} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -48,21 +48,12 @@ fi NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/dav1d/dav1d.SlackBuild b/source/l/dav1d/dav1d.SlackBuild new file mode 100755 index 000000000..8877ec7bb --- /dev/null +++ b/source/l/dav1d/dav1d.SlackBuild @@ -0,0 +1,124 @@ +#!/bin/bash + +# Copyright 2024 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=dav1d +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$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 {} \+ + +# 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 \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --buildtype=release \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. + +# 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 + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + CONTRIBUTING* COPYING* NEWS* README* THANKS* \ + doc/PATENTS* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/dav1d/dav1d.url b/source/l/dav1d/dav1d.url new file mode 100644 index 000000000..25b211994 --- /dev/null +++ b/source/l/dav1d/dav1d.url @@ -0,0 +1,2 @@ +http://downloads.videolan.org/pub/videolan/dav1d +https://code.videolan.org/videolan/dav1d/-/archive/1.4.3/dav1d-1.4.3.tar.gz diff --git a/source/l/python-tomli/slack-desc b/source/l/dav1d/slack-desc index 80be264c2..3afb21a99 100644 --- a/source/l/python-tomli/slack-desc +++ b/source/l/dav1d/slack-desc @@ -5,15 +5,15 @@ # 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-tomli: python-tomli (A lil' TOML parser) -python-tomli: -python-tomli: Tomli is a Python library for parsing TOML (a minimal configuration -python-tomli: file format). -python-tomli: -python-tomli: Homepage: https://github.com/hukkin/tomli -python-tomli: -python-tomli: -python-tomli: -python-tomli: -python-tomli: + |-----handy-ruler------------------------------------------------------| +dav1d: dav1d (AV1 decoder) +dav1d: +dav1d: dav1d is an AV1 decoder focused on speed and correctness. It supports +dav1d: all features from AV1, including all subsampling and bit-depth +dav1d: parameters. +dav1d: +dav1d: Homepage: https://code.videolan.org/videolan/dav1d +dav1d: +dav1d: +dav1d: +dav1d: diff --git a/source/l/db48/db48.SlackBuild b/source/l/db48/db48.SlackBuild index 9bf8933f9..6390f7d25 100755 --- a/source/l/db48/db48.SlackBuild +++ b/source/l/db48/db48.SlackBuild @@ -63,6 +63,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP diff --git a/source/l/dbus-python/dbus-python.SlackBuild b/source/l/dbus-python/dbus-python.SlackBuild index 558120920..91626795e 100755 --- a/source/l/dbus-python/dbus-python.SlackBuild +++ b/source/l/dbus-python/dbus-python.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dbus-python VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -79,32 +79,40 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -PYTHON_VERSION=3 \ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ --sysconfdir=/etc \ --localstatedir=/var \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --disable-html-docs \ - --disable-documentation \ - --enable-shared=yes \ - --enable-static=no \ - --build=$ARCH-slackware-linux \ - --host=$ARCH-slackware-linux \ - || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 + --buildtype=release \ + -Dinstalled_tests=false \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. + +# Maybe switch from meson to this sometime later? +#unshare -n python3 -m build --wheel --no-isolation || exit 1 +# +#python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 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/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING* INSTALL NEWS README* \ + AUTHORS* COPYING* INSTALL* NEWS* README* \ $PKG/usr/doc/$PKGNAM-$VERSION # If there's a ChangeLog, installing at least part of the recent history diff --git a/source/l/dconf/slack-desc b/source/l/dconf/slack-desc index 244468909..426839ec7 100644 --- a/source/l/dconf/slack-desc +++ b/source/l/dconf/slack-desc @@ -11,7 +11,7 @@ dconf: dconf: dconf is a low-level configuration system. Its main purpose is to dconf: provide a backend to the GSettings API in GLib. dconf: -dconf: Homepage: http://live.gnome.org/dconf +dconf: Homepage: https://wiki.gnome.org/Projects/dconf dconf: dconf: dconf: diff --git a/source/l/dotconf/dotconf.SlackBuild b/source/l/dotconf/dotconf.SlackBuild index 48e33b383..3acc23e0d 100755 --- a/source/l/dotconf/dotconf.SlackBuild +++ b/source/l/dotconf/dotconf.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dotconf VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/enchant/enchant.SlackBuild b/source/l/enchant/enchant.SlackBuild index 54fc62562..913c9117d 100755 --- a/source/l/enchant/enchant.SlackBuild +++ b/source/l/enchant/enchant.SlackBuild @@ -34,7 +34,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -52,14 +52,11 @@ fi TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/enchant/enchant.url b/source/l/enchant/enchant.url index 9d2ccb228..757649739 100644 --- a/source/l/enchant/enchant.url +++ b/source/l/enchant/enchant.url @@ -1,2 +1,2 @@ https://github.com/AbiWord/enchant -https://github.com/AbiWord/enchant/releases/download/v2.6.8/enchant-2.6.8.tar.gz +https://github.com/AbiWord/enchant/releases/download/v2.8.2/enchant-2.8.2.tar.gz diff --git a/source/l/esound/esound.SlackBuild b/source/l/esound/esound.SlackBuild index ba7b41510..52a52ab4f 100755 --- a/source/l/esound/esound.SlackBuild +++ b/source/l/esound/esound.SlackBuild @@ -65,6 +65,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + cd $TMP rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 diff --git a/source/l/expat/expat.SlackBuild b/source/l/expat/expat.SlackBuild index 167c9c5c6..466fd5478 100755 --- a/source/l/expat/expat.SlackBuild +++ b/source/l/expat/expat.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -44,14 +44,11 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/expat/expat.url b/source/l/expat/expat.url index 9493fbccd..a8ee008ca 100644 --- a/source/l/expat/expat.url +++ b/source/l/expat/expat.url @@ -1,2 +1,2 @@ -https://github.com/libexpat/libexpat/releases/download/R_2_6_2/expat-2.6.2.tar.lz -https://github.com/libexpat/libexpat/releases/download/R_2_6_2/expat-2.6.2.tar.lz.asc +https://github.com/libexpat/libexpat/releases/download/R_2_6_3/expat-2.6.3.tar.lz +https://github.com/libexpat/libexpat/releases/download/R_2_6_3/expat-2.6.3.tar.lz.asc diff --git a/source/l/ffmpeg/250471ea1745fc703eb346a2a662304536a311b1.patch b/source/l/ffmpeg/250471ea1745fc703eb346a2a662304536a311b1.patch deleted file mode 100644 index b735415ae..000000000 --- a/source/l/ffmpeg/250471ea1745fc703eb346a2a662304536a311b1.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 250471ea1745fc703eb346a2a662304536a311b1 Mon Sep 17 00:00:00 2001 -From: Sebastian Ramacher <sramacher@debian.org> -Date: Sun, 12 Nov 2023 18:46:28 +0100 -Subject: [PATCH] avcoded/fft: Fix memory leak if ctx2 is used - -Signed-off-by: James Almer <jamrial@gmail.com> ---- - libavcodec/avfft.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libavcodec/avfft.c b/libavcodec/avfft.c -index 3ef076d222..999b5ed79a 100644 ---- a/libavcodec/avfft.c -+++ b/libavcodec/avfft.c -@@ -130,6 +130,7 @@ av_cold void av_mdct_end(FFTContext *s) - { - if (s) { - AVTXWrapper *w = (AVTXWrapper *)s; -+ av_tx_uninit(&w->ctx2); - av_tx_uninit(&w->ctx); - av_free(w); - } --- -2.25.1 - diff --git a/source/l/ffmpeg/ffmpeg.SlackBuild b/source/l/ffmpeg/ffmpeg.SlackBuild index 1553821b0..8d2a8647b 100755 --- a/source/l/ffmpeg/ffmpeg.SlackBuild +++ b/source/l/ffmpeg/ffmpeg.SlackBuild @@ -34,7 +34,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -45,20 +45,20 @@ PKG=$TMP/package-$PKGNAM NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fPIC" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fPIC" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic -fPIC" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=int-conversion -Wno-error=incompatible-pointer-types" + # If PulseAudio is not found, use the _alsa $TAG and disable it in the build: if [ ! -r /usr/lib${LIBDIRSUFFIX}/pkgconfig/libpulse.pc ]; then TAG="_alsa" @@ -123,9 +123,7 @@ libbs2b="" ; [ "${BS2B:-no}" != "no" ] && libbs2b="--enable-libbs2b" rubberband="" ; [ "${RUBBERBAND:-no}" != "no" ] && rubberband="--enable-librubberband" tesseract="" ; [ "${TESSERACT:-no}" != "no" ] && tesseract="--enable-libtesseract" libjack="" ; [ "${JACK:-no}" != "no" ] && libjack="--enable-libjack" -libaom="" ; [ "${AOM:-no}" != "no" ] && libaom="--enable-libaom" lv2="" ; [ "${LV2:-no}" != "no" ] && lv2="--enable-lv2" -libdav1d="" ; [ "${DAV1D:-no}" != "no" ] && libdav1d="--enable-libdav1d" rabbitmq="" ; [ "${RABBITMQ:-no}" != "no" ] && rabbitmq="--enable-librabbitmq" libcodec2="" ; [ "${CODEC2:-no}" != "no" ] && libcodec2="--enable-libcodec2" libsoxr="" ; [ "${SOXR:-no}" != "no" ] && libsoxr="--enable-libsoxr" @@ -159,9 +157,11 @@ liblensfun="" ; [ "${LENSFUN:-no}" != "no" ] && liblensfun="--enable-liblens fontconfig="" ; [ "${FONTCONFIG:-yes}" != "no" ] && fontconfig="--enable-libfontconfig" freetype="" ; [ "${FREETYPE:-yes}" != "no" ] && freetype="--enable-libfreetype" fribidi="" ; [ "${FRIBIDI:-yes}" != "no" ] && fribidi="--enable-libfribidi" +libaom="" ; [ "${AOM:-yes}" != "no" ] && libaom="--enable-libaom" libbluray="" ; [ "${BLURAY:-yes}" != "no" ] && libbluray="--enable-libbluray" libcaca="" ; [ "${CACA:-yes}" != "no" ] && libcaca="--enable-libcaca" libcdio="" ; [ "${LIBCDIO:-yes}" != "no" ] && libcdio="--enable-libcdio" +libdav1d="" ; [ "${DAV1D:-yes}" != "no" ] && libdav1d="--enable-libdav1d" libssh="" ; [ "${LIBSSH:-yes}" != "no" ] && libssh="--enable-libssh" libtheora="" ; [ "${THEORA:-yes}" != "no" ] && libtheora="--enable-libtheora" libv4l2="" ; [ "${V4L2:-yes}" != "no" ] && libv4l2="--enable-libv4l2" @@ -207,12 +207,6 @@ find -L . \ # Restore missing function needed by Chromium and qt-webengine: zcat $CWD/add-av_stream_get_first_dts-for-chromium.patch.gz | patch -p1 --verbose || exit 1 -# Build against recent Vulkan: -zcat $CWD/ffmpeg.vulkan.diff.gz | patch -p1 --verbose || exit 1 - -# Fix ctx memory leak: -zcat $CWD/250471ea1745fc703eb346a2a662304536a311b1.patch | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/l/ffmpeg/ffmpeg.vulkan.diff b/source/l/ffmpeg/ffmpeg.vulkan.diff deleted file mode 100644 index afd963664..000000000 --- a/source/l/ffmpeg/ffmpeg.vulkan.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- ./configure.orig 2023-03-26 09:21:00.000000000 -0500 -+++ ./configure 2023-08-29 13:13:08.176019532 -0500 -@@ -6551,10 +6551,10 @@ - enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType - enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info - enabled libglslang && { check_lib spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \ -- -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen \ -+ -lglslang -lMachineIndependent -lHLSL -lGenericCodeGen \ - -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm || - require spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \ -- -lglslang -lOSDependent -lHLSL -lOGLCompiler \ -+ -lglslang -lHLSL \ - -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm; } - enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu || - require libgme gme/gme.h gme_new_emu -lgme -lstdc++; } diff --git a/source/l/fluidsynth/fluidsynth.SlackBuild b/source/l/fluidsynth/fluidsynth.SlackBuild index da41285a4..5a1fdb8b2 100755 --- a/source/l/fluidsynth/fluidsynth.SlackBuild +++ b/source/l/fluidsynth/fluidsynth.SlackBuild @@ -34,7 +34,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -44,14 +44,11 @@ fi TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/freetype/freetype.SlackBuild b/source/l/freetype/freetype.SlackBuild index 1e6b04318..d95f79848 100755 --- a/source/l/freetype/freetype.SlackBuild +++ b/source/l/freetype/freetype.SlackBuild @@ -31,7 +31,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -46,14 +46,11 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/frei0r-plugins/frei0r-plugins.SlackBuild b/source/l/frei0r-plugins/frei0r-plugins.SlackBuild index f214929d9..64ab2cc30 100755 --- a/source/l/frei0r-plugins/frei0r-plugins.SlackBuild +++ b/source/l/frei0r-plugins/frei0r-plugins.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=frei0r-plugins SRCNAM=frei0r VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/frei0r-plugins/frei0r-plugins.url b/source/l/frei0r-plugins/frei0r-plugins.url index 0b6de368e..2f641ac78 100644 --- a/source/l/frei0r-plugins/frei0r-plugins.url +++ b/source/l/frei0r-plugins/frei0r-plugins.url @@ -1,3 +1,3 @@ #https://files.dyne.org/frei0r https://github.com/dyne/frei0r -https://github.com/dyne/frei0r/archive/v2.3.2/frei0r-plugins-2.3.2.tar.gz +https://github.com/dyne/frei0r/archive/v2.3.3/frei0r-plugins-2.3.3.tar.gz diff --git a/source/l/fribidi/fribidi.url b/source/l/fribidi/fribidi.url new file mode 100644 index 000000000..f604e3157 --- /dev/null +++ b/source/l/fribidi/fribidi.url @@ -0,0 +1 @@ +https://github.com/fribidi/fribidi/releases/download/v1.0.15/fribidi-1.0.15.tar.xz diff --git a/source/l/gc/gc.SlackBuild b/source/l/gc/gc.SlackBuild index b2a0a9f22..65b3e016f 100755 --- a/source/l/gc/gc.SlackBuild +++ b/source/l/gc/gc.SlackBuild @@ -32,7 +32,7 @@ LAO_VERSION="7.8.2" # libatomic_ops version # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -54,14 +54,11 @@ PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $PKG/usr -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/gc/gc.url b/source/l/gc/gc.url index aa6b469dd..bf6875980 100644 --- a/source/l/gc/gc.url +++ b/source/l/gc/gc.url @@ -1,2 +1,4 @@ https://github.com/ivmai/bdwgc/ +https://github.com/ivmai/bdwgc/releases/download/v8.2.8/gc-8.2.8.tar.gz https://github.com/ivmai/libatomic_ops/ +https://github.com/ivmai/libatomic_ops/releases/download/v7.8.2/libatomic_ops-7.8.2.tar.gz diff --git a/source/l/gdbm/gdbm.SlackBuild b/source/l/gdbm/gdbm.SlackBuild index 1a446bda5..a39d327ea 100755 --- a/source/l/gdbm/gdbm.SlackBuild +++ b/source/l/gdbm/gdbm.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gdbm VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild b/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild index 1a8c6a2a6..4c18cb626 100755 --- a/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild +++ b/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gdk-pixbuf VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -95,7 +95,9 @@ meson setup \ --localstatedir=/var \ --buildtype=release \ -Dgtk_doc=false \ + -Dtests=false \ -Dinstalled_tests=false \ + -Dothers=enabled \ .. || exit 1 "${NINJA:=ninja}" $NUMJOBS || exit 1 DESTDIR=$PKG $NINJA install || exit 1 diff --git a/source/l/gegl/298b6a2afb87b4b5b15c6e715967b57534cd0af0.patch b/source/l/gegl/298b6a2afb87b4b5b15c6e715967b57534cd0af0.patch new file mode 100644 index 000000000..c9cd688bb --- /dev/null +++ b/source/l/gegl/298b6a2afb87b4b5b15c6e715967b57534cd0af0.patch @@ -0,0 +1,30 @@ +From 298b6a2afb87b4b5b15c6e715967b57534cd0af0 Mon Sep 17 00:00:00 2001 +From: Lukas Oberhuber <lukaso@gmail.com> +Date: Sat, 4 May 2024 23:54:25 +0000 +Subject: [PATCH] ff-save: Fix 66de8124 + +--- + operations/external/ff-save.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c +index ffa5d8bee..0dd9f96cd 100644 +--- a/operations/external/ff-save.c ++++ b/operations/external/ff-save.c +@@ -470,8 +470,13 @@ static void encode_audio_fragments (Priv *p, AVFormatContext *oc, AVStream *st, + { + float left = 0, right = 0; + get_sample_data (p, i + p->audio_read_pos, &left, &right); ++#if LIBAVCODEC_VERSION_MAJOR < 61 ++ ((int32_t*)frame->data[0])[c->channels*i+0] = left * (1<<31); ++ ((int32_t*)frame->data[0])[c->channels*i+1] = right * (1<<31); ++#else + ((int32_t*)frame->data[0])[c->ch_layout.nb_channels*i+0] = left * (1<<31); + ((int32_t*)frame->data[0])[c->ch_layout.nb_channels*i+1] = right * (1<<31); ++#endif + } + break; + case AV_SAMPLE_FMT_S32P: +-- +GitLab + diff --git a/source/l/gegl/66de8124f496617eee8e6b5c68138a00343882db.patch b/source/l/gegl/66de8124f496617eee8e6b5c68138a00343882db.patch new file mode 100644 index 000000000..650e386c2 --- /dev/null +++ b/source/l/gegl/66de8124f496617eee8e6b5c68138a00343882db.patch @@ -0,0 +1,113 @@ +From 66de8124f496617eee8e6b5c68138a00343882db Mon Sep 17 00:00:00 2001 +From: Joe Locash <@jlocash2> +Date: Sat, 4 May 2024 17:08:04 +0200 +Subject: [PATCH] ff-load, ff-save: fix build with FFmpeg 7 + +Fixing issue #371 +--- + operations/external/ff-load.c | 8 ++++++++ + operations/external/ff-save.c | 24 ++++++++++++++++++++++-- + 2 files changed, 30 insertions(+), 2 deletions(-) + +diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c +index 6b96fdfdd..dc24a6d59 100644 +--- a/operations/external/ff-load.c ++++ b/operations/external/ff-load.c +@@ -250,7 +250,11 @@ decode_audio (GeglOperation *operation, + while (samples_left) + { + int sample_count = samples_left; ++#if LIBAVCODEC_VERSION_MAJOR < 61 + int channels = MIN(p->audio_stream->codecpar->channels, GEGL_MAX_AUDIO_CHANNELS); ++#else ++ int channels = MIN(p->audio_stream->codecpar->ch_layout.nb_channels, GEGL_MAX_AUDIO_CHANNELS); ++#endif + GeglAudioFragment *af = gegl_audio_fragment_new (o->audio_sample_rate, channels, + AV_CH_LAYOUT_STEREO, samples_left); + //); +@@ -553,7 +557,11 @@ prepare (GeglOperation *operation) + else + { + o->audio_sample_rate = p->audio_stream->codecpar->sample_rate; ++#if LIBAVCODEC_VERSION_MAJOR < 61 + o->audio_channels = MIN(p->audio_stream->codecpar->channels, GEGL_MAX_AUDIO_CHANNELS); ++#else ++ o->audio_channels = MIN(p->audio_stream->codecpar->ch_layout.nb_channels, GEGL_MAX_AUDIO_CHANNELS); ++#endif + } + } + +diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c +index 9196b34aa..ffa5d8bee 100644 +--- a/operations/external/ff-save.c ++++ b/operations/external/ff-save.c +@@ -315,8 +315,13 @@ add_audio_stream (GeglProperties *o, AVFormatContext * oc, int codec_id) + } + cp->sample_rate = o->audio_sample_rate; + ++#if LIBAVCODEC_VERSION_MAJOR < 61 + cp->channel_layout = AV_CH_LAYOUT_STEREO; + cp->channels = 2; ++#else ++ cp->ch_layout.u.mask = AV_CH_LAYOUT_STEREO; ++ cp->ch_layout.nb_channels = 2; ++#endif + + return st; + } +@@ -392,8 +397,13 @@ static AVFrame *alloc_audio_frame(AVCodecContext *c, int nb_samples) + + frame->format = c->sample_fmt; + ++#if LIBAVCODEC_VERSION_MAJOR < 61 + frame->channel_layout = c->channel_layout; + frame->channels = c->channels; ++#else ++ frame->ch_layout = c->ch_layout; ++ frame->ch_layout.nb_channels = c->ch_layout.nb_channels; ++#endif + frame->sample_rate = c->sample_rate; + frame->nb_samples = nb_samples; + +@@ -423,8 +433,13 @@ static void encode_audio_fragments (Priv *p, AVFormatContext *oc, AVStream *st, + { + float left = 0, right = 0; + get_sample_data (p, i + p->audio_read_pos, &left, &right); ++#if LIBAVCODEC_VERSION_MAJOR < 61 + ((float*)frame->data[0])[c->channels*i+0] = left; + ((float*)frame->data[0])[c->channels*i+1] = right; ++#else ++ ((float*)frame->data[0])[c->ch_layout.nb_channels*i+0] = left; ++ ((float*)frame->data[0])[c->ch_layout.nb_channels*i+1] = right; ++#endif + } + break; + case AV_SAMPLE_FMT_FLTP: +@@ -441,8 +456,13 @@ static void encode_audio_fragments (Priv *p, AVFormatContext *oc, AVStream *st, + { + float left = 0, right = 0; + get_sample_data (p, i + p->audio_read_pos, &left, &right); ++#if LIBAVCODEC_VERSION_MAJOR < 61 + ((int16_t*)frame->data[0])[c->channels*i+0] = left * (1<<15); + ((int16_t*)frame->data[0])[c->channels*i+1] = right * (1<<15); ++#else ++ ((int16_t*)frame->data[0])[c->ch_layout.nb_channels*i+0] = left * (1<<15); ++ ((int16_t*)frame->data[0])[c->ch_layout.nb_channels*i+1] = right * (1<<15); ++#endif + } + break; + case AV_SAMPLE_FMT_S32: +@@ -450,8 +470,8 @@ static void encode_audio_fragments (Priv *p, AVFormatContext *oc, AVStream *st, + { + float left = 0, right = 0; + get_sample_data (p, i + p->audio_read_pos, &left, &right); +- ((int32_t*)frame->data[0])[c->channels*i+0] = left * (1<<31); +- ((int32_t*)frame->data[0])[c->channels*i+1] = right * (1<<31); ++ ((int32_t*)frame->data[0])[c->ch_layout.nb_channels*i+0] = left * (1<<31); ++ ((int32_t*)frame->data[0])[c->ch_layout.nb_channels*i+1] = right * (1<<31); + } + break; + case AV_SAMPLE_FMT_S32P: +-- +GitLab + diff --git a/source/l/gegl/gegl.SlackBuild b/source/l/gegl/gegl.SlackBuild index c9866cfd1..17c0e0b30 100755 --- a/source/l/gegl/gegl.SlackBuild +++ b/source/l/gegl/gegl.SlackBuild @@ -25,12 +25,12 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gegl VERSION=${VERSION:-$(echo gegl-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -50,14 +50,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-gegl -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -82,6 +79,10 @@ find . \ # later if it causes any unwanted side effects. zcat $CWD/gegl.no.runtime.dot.check.diff.gz | patch -p1 --verbose || exit 1 +# Fix for ffmpeg7: +cat $CWD/66de8124f496617eee8e6b5c68138a00343882db.patch | patch -p1 --verbose || exit 1 +cat $CWD/298b6a2afb87b4b5b15c6e715967b57534cd0af0.patch | patch -p1 --verbose || exit 1 + # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" @@ -99,7 +100,9 @@ meson setup \ --sysconfdir=/etc \ --localstatedir=/var \ --buildtype=release \ - -Dgi-docgen=disabled \ + -Dworkshop=true \ + -Dmrg=disabled \ + -Dmaxflow=disabled \ .. || exit 1 "${NINJA:=ninja}" $NUMJOBS || exit 1 DESTDIR=$PKG $NINJA install || exit 1 diff --git a/source/l/gexiv2/gexiv2.SlackBuild b/source/l/gexiv2/gexiv2.SlackBuild index 098e893e6..9c09631a3 100755 --- a/source/l/gexiv2/gexiv2.SlackBuild +++ b/source/l/gexiv2/gexiv2.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gexiv2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -94,7 +94,7 @@ cd .. mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README \ + AUTHORS* COPYING* ChangeLog INSTALL* NEWS* README* \ $PKG/usr/doc/$PKGNAM-$VERSION # If there's a ChangeLog, installing at least part of the recent history @@ -110,4 +110,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/l/gjs/gjs.SlackBuild b/source/l/gjs/gjs.SlackBuild index 8b3c5d146..41b84358b 100755 --- a/source/l/gjs/gjs.SlackBuild +++ b/source/l/gjs/gjs.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -49,14 +49,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -102,6 +99,10 @@ unshare -n meson setup \ DESTDIR=$PKG $NINJA install || exit 1 cd .. +# Hey, I said not to install these: +rm -rf $PKG/usr/libexec/installed-tests +rmdir $PKG/usr/libexec 2> /dev/null + # 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 diff --git a/source/l/glade/glade.SlackBuild b/source/l/glade/glade.SlackBuild index 750ee1b97..cda119f2a 100755 --- a/source/l/glade/glade.SlackBuild +++ b/source/l/glade/glade.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=glade VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/glib/glib.SlackBuild b/source/l/glib/glib.SlackBuild index c15392644..6fec48212 100755 --- a/source/l/glib/glib.SlackBuild +++ b/source/l/glib/glib.SlackBuild @@ -90,6 +90,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int -Wno-error=implicit-function-declaration" + # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild index 83bb0ba32..bf6a79bff 100755 --- a/source/l/glib2/glib2.SlackBuild +++ b/source/l/glib2/glib2.SlackBuild @@ -31,7 +31,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -49,14 +49,11 @@ fi TMP=${TMP:-/tmp} PKG=$TMP/package-glib2 -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -95,6 +92,7 @@ meson setup \ --localstatedir=/var \ --buildtype=release \ -Dselinux=disabled \ + -Dglib_debug=disabled \ -Dman-pages=enabled \ -Ddocumentation=false \ -Dinstalled_tests=false \ diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild index e16558257..38d11fc27 100755 --- a/source/l/glibc/glibc.SlackBuild +++ b/source/l/glibc/glibc.SlackBuild @@ -20,39 +20,60 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Extended to build 32-bit compatibility libraries on x86_64, +# by Fred Emmott <mail@fredemmott.co.uk>. No copyright claim. +# Simplified to produce combined packages (no separate compat-32), +# by Eric Hameleers <alien@slackware.com> +# Merged into main glibc.SlackBuild and adjusted to be capable of +# building as pure 64-bit, pure 32-bit, or multilib +# by Patrick Volkerding <volkerdi@slackware.com> + cd $(dirname $0) ; CWD=$(pwd) PKGNAM=glibc VERSION=${VERSION:-$(echo glibc-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} CHECKOUT=${CHECKOUT:-""} -BUILD=${BUILD:-1} +BUILD=${BUILD:-5} + +# An optional tag for after the version number in the package's filename: +#VERTAG=_multilib + +# An optional tag for after the build number in the package's filename: +#TAG=alien # I was considering disabling NSCD, but MoZes talked me out of it. :) #DISABLE_NSCD=" --disable-nscd " -# $ARCH may be preset, otherwise i586 compatibility with i686 binary -# structuring is the Slackware default. +# $ARCH may be preset, otherwise i686 (pentium4) is the Slackware default. if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi +# Try to figure out if we want multilib (or set MULTILIB= manually): +if [ "$ARCH" = "x86_64" -a -f /usr/lib/libgcc_s.so ]; then + MULTILIB=${MULTILIB:-"--enable-multilib"} +else + MULTILIB=${MULTILIB:-"--disable-multilib"} +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 "glibc-$VERSION-$ARCH-$BUILD.txz" - echo "glibc-i18n-$VERSION-$ARCH-$BUILD.txz" - echo "glibc-profile-$VERSION-$ARCH-$BUILD.txz" - echo "aaa_glibc-solibs-$VERSION-$ARCH-$BUILD.txz" + echo "glibc-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz" + echo "glibc-i18n-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz" + echo "glibc-profile-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz" + echo "aaa_glibc-solibs-${VERSION}${VERTAG}-$ARCH-${BUILD}${TAG}.txz" exit 0 fi -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} +# How many jobs to run in parallel: +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} # Work around -Werror failure with gcc-10.2.0. # NOTE: Until the next glibc release takes care of this issue, this will @@ -65,49 +86,36 @@ if [ "$(gcc -dumpversion)" = "10.2.0" ]; then fi fi +# Define the build flags for both 64-bit and 32-bit x86 before using them +# below. We'll possibly need them both later on... +# -mstackrealign is needed for compatibilty with legacy binaries that +# keep 4-byte stack alignment. +# -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer are required by +# both nouveau and the nvidia driver to prevent crashes and hangs. +# We could also possibly add these: +# -fno-tree-vectorize -fno-tree-loop-vectorize -fno-tree-slp-vectorize +# But since we're already requiring at least a pentium4, I'm not sure +# what the benefit would be, so we won't do this yet. +X86FLAGS32="-O3 -march=pentium4 -mtune=generic -mstackrealign -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" +X86FLAGS64="-O3 -march=x86-64 -mtune=generic -fPIC" + # I'll break this out as an option for fun :-) case $ARCH in - i386) - OPTIMIZ="-O3 -march=i386 -mcpu=i686" - LIBDIRSUFFIX="" - ;; - i486) - OPTIMIZ="-O3 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" - ;; - i586) - OPTIMIZ="-O3 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" - ;; i686) - OPTIMIZ="-O3 -march=i686" - LIBDIRSUFFIX="" - ;; - athlon) - OPTIMIZ="-O3 -march=athlon" - LIBDIRSUFFIX="" - ;; - s390) - OPTIMIZ="-O3" + OPTIMIZ="${X86FLAGS32}" LIBDIRSUFFIX="" + TARGET=${TARGET:-i686} ;; x86_64) - OPTIMIZ="-O3 -fPIC" + OPTIMIZ="${X86FLAGS64}" LIBDIRSUFFIX="64" + TARGET=${TARGET:-x86_64} + TARGET32=${TARGET32:-i686} ;; *) OPTIMIZ="-O3" LIBDIRSUFFIX="" - ;; -esac - -case $ARCH in - x86_64) - TARGET=${TARGET:-x86_64} - ;; - i586) - # This should be i586 for all 32-bit x86 arch: - TARGET=${TARGET:-i586} + TARGET=${TARGET:-"$ARCH"} ;; esac @@ -128,19 +136,27 @@ mkdir -p $TMP # This function fixes a doinst.sh file for x86_64. # With thanks to Fred Emmott. fix_doinst() { - if [ "x$LIBDIRSUFFIX" = "x" ]; then + if [ "$LIBDIRSUFFIX" = "" ]; then return; fi; + if [ "$MULTILIB" = "--enable-multilib" ]; then + # Save a copy of this to append the 32-bit links later. + cp -a install/doinst.sh install/doinst32.sh + fi # Fix "( cd usr/lib ;" occurrences sed -i "s#lib ;#lib${LIBDIRSUFFIX} ;#" install/doinst.sh # Fix "lib/" occurrences sed -i "s#lib/#lib${LIBDIRSUFFIX}/#g" install/doinst.sh # Fix "( cd lib" occurrences sed -i "s#( cd lib\$#( cd lib${LIBDIRSUFFIX}#" install/doinst.sh - if [ "$SLACKWARE_ARCH" = "x86_64" ]; then sed -i 's#ld-linux.so.2#ld-linux-x86-64.so.2#' install/doinst.sh fi + if [ "$MULTILIB" = "--enable-multilib" ]; then + echo "# Add 32-bit library links for multilib:" >> install/doinst.sh + cat install/doinst32.sh | grep -e '^( cd lib ' -e '^( cd usr/lib ' >> install/doinst.sh + rm -f install/doinst32.sh + fi } # This is a patch function to put all glibc patches in the build script @@ -190,6 +206,10 @@ mkdir -p $PKG/usr/man mkdir -p $PKG/usr/share mkdir -p $PKG/var/db/nscd mkdir -p $PKG/var/run/nscd +if [ "$MULTILIB" = "--enable-multilib" ]; then + mkdir -p $PKG/lib + mkdir -p $PKG/usr/lib +fi # Begin extract/compile: cd $TMP @@ -216,44 +236,69 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Make build directory: -mkdir build-glibc-$VERSION -cd build-glibc-$VERSION || exit 1 +# Main function to build glibc: +build_glibc() { + CFLAGS="-g $OPTIMIZ" \ + CXXFLAGS="-g $OPTIMIZ" \ + ../configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --enable-kernel=4.4 \ + --with-headers=/usr/include \ + --enable-add-ons \ + --enable-multi-arch \ + --enable-profile \ + $DISABLE_NSCD \ + $WERROR \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --with-tls \ + --with-__thread \ + --without-cvs \ + $TARGET-slackware-linux || exit 1 + make $NUMJOBS || exit 1 + make $NUMJOBS install install_root=$PKG || exit 1 + # Don't use this, as it makes the i18n package WAY bigger: + #make localedata/install-locale-files DESTDIR=$PKG || exit 1 + # This is ugly run in parallel, and seems to hang at the end. But it actually + # completes much faster. :) + make $NUMJOBS localedata/install-locales install_root=$PKG DESTDIR=$PKG || exit 1 +} + +# If this is a multilib build, then build the 32-bit binaries first so that the +# 64-bit stuff will overwrite it later where appropriate: +if [ "$MULTILIB" = "--enable-multilib" ]; then + echo "BUILDING DAS 32-BiT NPTL GLIBC" + ( + MYRET=0 + mkdir build-glibc-compat32-$VERSION + cd build-glibc-compat32-$VERSION || exit 1 + export BUILD_ARCH=$TARGET + export TARGET=$TARGET32 + export LIBDIRSUFFIX= + export CC="gcc -m32" + export CXX="g++ -m32" + export OPTIMIZ="${X86FLAGS32}" + build_glibc || exit 1 + MYRET=$(( $MYRET + $? )) + # Build and install libxcrypt: + pushd $CWD + ARCH=$TARGET LIBDIRSUFFIX=$LIBDIRSUFFIX SLKCFLAGS=$OPTIMIZ ./libxcrypt.build || exit 1 + MYRET=$(( $MYRET + $? )) + popd + exit $MYRET + ) || exit $? +fi +# Now do the main build: +mkdir build-glibc-$VERSION +cd build-glibc-$VERSION echo "BUILDING DAS NPTL GLIBC" -# We are setting the variable below so that x86 ISA level is not included -# in shared libraries. Without this, glibc compiled with -march= may not -# run on some CPUs that it should be able to support. Needed for glibc-2.33. -# FIXME: revisit this with future glibc releases! -libc_cv_include_x86_isa_level=no \ -CFLAGS="-g $OPTIMIZ" \ -../configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-kernel=4.4 \ - --with-headers=/usr/include \ - --enable-add-ons \ - --enable-profile \ - $DISABLE_NSCD \ - $WERROR \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --with-tls \ - --with-__thread \ - --without-cvs \ - $TARGET-slackware-linux - -make $NUMJOBS || exit 1 -make $NUMJOBS install install_root=$PKG || exit 1 -# Don't use this, as it makes the i18n package WAY bigger: -#make localedata/install-locale-files DESTDIR=$PKG || exit 1 -# This is ugly run in parallel, and seems to hang at the end. But it actually -# completes much faster. :) -make $NUMJOBS localedata/install-locales install_root=$PKG DESTDIR=$PKG || exit 1 +build_glibc || exit 1 # Build and install libxcrypt: pushd $CWD -ARCH=$SLACKWARE_ARCH LIBDIRSUFFIX=$LIBDIRSUFFIX SLKCFLAGS=$OPTIMIZ ./libxcrypt.build +ARCH=$SLACKWARE_ARCH LIBDIRSUFFIX=$LIBDIRSUFFIX SLKCFLAGS=$OPTIMIZ ./libxcrypt.build || exit 1 popd # We've always had an sln symlink in /bin, so let's make sure it @@ -261,20 +306,6 @@ popd mkdir -p $PKG/bin ( cd $PKG/bin ; ln -sf /sbin/sln sln ) -# This bit was mostly copped from Fedora Rawhide's .spec file. I'm not -# entirely sure how important it is, since I'm not aware of anything -# we ship trying to link libpthread as static. What it does is make sure -# that anything linking libpthread static includes all of the functions -# so that the resulting binary doesn't rely on parts of the library that -# were not linked in. Optimizing actually working over binary size, so -# to speak. -( cd $PKG/usr/lib${LIBDIRSUFFIX} - gcc -r -nostdlib -o libpthread.o -Wl,--whole-archive ./libpthread.a - rm libpthread.a - ar rcs libpthread.a libpthread.o - rm libpthread.o -) - # The prevailing standard seems to be putting unstripped libraries in # /usr/lib/debug/ and stripping the debugging symbols from all the other # libraries. @@ -283,18 +314,25 @@ cp -a $PKG/lib${LIBDIRSUFFIX}/l*.so* $PKG/usr/lib${LIBDIRSUFFIX}/debug cp -a $PKG/usr/lib${LIBDIRSUFFIX}/*.a $PKG/usr/lib${LIBDIRSUFFIX}/debug # Don't need debug+profile: ( cd $PKG/usr/lib${LIBDIRSUFFIX}/debug ; rm -f *_p.* ) +if [ "$MULTILIB" = "--enable-multilib" ]; then + mkdir -p $PKG/usr/lib/debug + cp -a $PKG/lib/l*.so* $PKG/usr/lib/debug + cp -a $PKG/usr/lib/*.a $PKG/usr/lib/debug + # Don't need debug+profile: + ( cd $PKG/usr/lib/debug ; rm -f *_p.* ) +fi # NOTE: Is there really a reason for the glibc-debug package? # If you're debugging glibc, you can also compile it, right? - ## COMMENTED OUT: There's no reason for profile libs to include -g information. ## Put back unstripped profiling libraries: #mv $PKG/usr/lib${LIBDIRSUFFIX}/debug/*_p.a $PKG/usr/lib${LIBDIRSUFFIX} # It might be best to put the unstripped and profiling libraries in glibc-debug and glibc-profile. # I don't think "strip -g" causes the pthread problems. It's --strip-unneeded that does. -strip -g $PKG/lib${LIBDIRSUFFIX}/l*.so* -strip -g $PKG/usr/lib${LIBDIRSUFFIX}/l*.so* strip -g $PKG/usr/lib${LIBDIRSUFFIX}/lib*.a +if [ "$MULTILIB" = "--enable-multilib" ]; then + strip -g $PKG/usr/lib/lib*.a +fi # Remove the rquota.x and rquota.h include files, as they are provided by # the quota package: @@ -322,20 +360,6 @@ if [ -r NEWS ]; then touch -r NEWS $DOCSDIR/NEWS fi -# OK, there are some very old Linux standards that say that any binaries in a /bin or -# /sbin directory (and the directories themselves) should be group bin rather than -# group root, unless a specific group is really needed for some reason. -# -# I can't find any mention of this in more recent standards docs, and always thought -# that it was pretty cosmetic anyway (hey, if there's a reason -- fill me in!), so -# it's possible that this ownership change won't be followed in the near future -# (it's a PITA, and causes many bug reports when the perms change is occasionally -# forgotten). -# -# But, it's hard to get me to break old habits, so we'll continue the tradition here: -# -# No, no we won't. You know how we love to break traditions. - # Strip most binaries: ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-debug 2> /dev/null @@ -357,8 +381,10 @@ if [ -d $PKG/usr/info ]; then ) fi -# This is junk +# This is junk: rm $PKG/etc/ld.so.cache + +# Remove any stray .orig files: ( cd $PKG find . -name "*.orig" -exec rm {} \+ ) @@ -372,11 +398,17 @@ cd $PPROFILE mkdir -p usr/lib${LIBDIRSUFFIX} # Might as well just grab these with 'mv' to simplify things later: mv $PKG/usr/lib${LIBDIRSUFFIX}/lib*_p.a usr/lib${LIBDIRSUFFIX} -# Profile libs should be stripped. Use the debug libs to debug... +# Profile libs should be stripped. Use the debug libs to debug... ( cd usr/lib${LIBDIRSUFFIX} ; strip -g *.a ) +if [ "$MULTILIB" = "--enable-multilib" ]; then + # Might as well just grab these with 'mv' to simplify things later: + mv $PKG/usr/lib/lib*_p.a usr/lib + # Profile libs should be stripped. Use the debug libs to debug... + ( cd usr/lib ; strip -g *.a ) +fi mkdir install cp -a $CWD/slack-desc.glibc-profile install/slack-desc -makepkg -l y -c n $TMP/glibc-profile-$VERSION-$SLACKWARE_ARCH-$BUILD.txz +makepkg -l y -c n $TMP/glibc-profile-${VERSION}${VERTAG}-$SLACKWARE_ARCH-${BUILD}${TAG}.txz # THIS IS NO LONGER PACKAGED (or is it? might be better to let it be made, and then ship it or not...) # glibc-debug: @@ -386,25 +418,36 @@ mkdir -p usr/lib${LIBDIRSUFFIX} mv $PKG/usr/lib${LIBDIRSUFFIX}/debug usr/lib${LIBDIRSUFFIX} mkdir install cp -a $CWD/slack-desc.glibc-debug install/slack-desc +if [ "$MULTILIB" = "--enable-multilib" ]; then + mkdir -p usr/lib + # Might as well just grab these with 'mv' to simplify things later: + mv $PKG/usr/lib/debug usr/lib +fi ## Don't package this: -#makepkg -l y -c n $TMP/glibc-debug-$VERSION-$SLACKWARE_ARCH-$BUILD.txz +#makepkg -l y -c n $TMP/glibc-debug-${VERSION}${VERTAG}-$SLACKWARE_ARCH-${BUILD}${TAG}.txz ## INSTEAD, NUKE THESE LIBS #rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/debug # glibc-i18n: cd $PI18N -mkdir -p usr/lib${LIBDIRSUFFIX}/locale -mv $PKG/usr/lib${LIBDIRSUFFIX}/locale/* usr/lib${LIBDIRSUFFIX}/locale mkdir -p usr/share/{i18n,locale} mv $PKG/usr/share/i18n/* usr/share/i18n mv $PKG/usr/share/locale/* usr/share/locale +mkdir -p usr/lib${LIBDIRSUFFIX}/locale +mv $PKG/usr/lib${LIBDIRSUFFIX}/locale/* usr/lib${LIBDIRSUFFIX}/locale # Leave copies of the C, POSIX, and en_US locales in the main glibc package: cp -a usr/lib${LIBDIRSUFFIX}/locale/{C,en_US}* $PKG/usr/lib${LIBDIRSUFFIX}/locale mkdir -p $PKG/usr/share/i18n/locales cp -a usr/share/i18n/locales/{C,POSIX,en_US} $PKG/usr/share/i18n/locales +if [ "$MULTILIB" = "--enable-multilib" ]; then + mkdir -p usr/lib/locale + mv $PKG/usr/lib/locale/* usr/lib/locale + # Leave copies of the C, POSIX, and en_US locales in the main glibc package: + cp -a usr/lib/locale/{C,en_US}* $PKG/usr/lib/locale +fi mkdir install cp -a $CWD/slack-desc.glibc-i18n install/slack-desc -makepkg -l y -c n $TMP/glibc-i18n-$VERSION-$SLACKWARE_ARCH-$BUILD.txz +makepkg -l y -c n $TMP/glibc-i18n-${VERSION}${VERTAG}-$SLACKWARE_ARCH-${BUILD}${TAG}.txz # aaa_glibc-solibs: cd $PSOLIBS @@ -441,6 +484,20 @@ cp -a $PKG/lib${LIBDIRSUFFIX}/* lib${LIBDIRSUFFIX} # format: mv ld-linux*-${VERSION}.so ld-${VERSION}.so ) +if [ "$MULTILIB" = "--enable-multilib" ]; then + # We don't need to use an incoming directory here. + mkdir -p lib + cp -a $PKG/lib/* lib + ( cd lib + for cryptlib in libcrypt.so.* ; do + CRYPTSO=$(echo $cryptlib | cut -f 3 -d .) + mv $cryptlib libcrypt${CRYPTSO}-${VERSION}.so + done + for library in *.so.* ; do + mv $library $(echo $library | cut -f 1 -d .)-${VERSION}.so + done + ) +fi mkdir -p usr cp -a $PKG/usr/bin usr mv usr/bin/ldd . @@ -450,6 +507,10 @@ mkdir -p usr/lib${LIBDIRSUFFIX} # The gconv directory has a lot of stuff, but including it here will save some problems. # Seems standard elsewhere. cp -a $PKG/usr/lib${LIBDIRSUFFIX}/gconv usr/lib${LIBDIRSUFFIX} +if [ "$MULTILIB" = "--enable-multilib" ]; then + mkdir -p usr/lib + cp -a $PKG/usr/lib/gconv usr/lib +fi mkdir -p usr/libexec cp -a $PKG/usr/libexec/pt_chown usr/libexec # Same usr.bin deal: @@ -469,8 +530,11 @@ sed -i "s/@@VERSION@@/$VERSION/g" install/doinst.sh fix_doinst # Only scrub the links in /lib{,64} that will be created by ldconfig: find lib${LIBDIRSUFFIX} -type l -exec rm {} \+ +if [ "$MULTILIB" = "--enable-multilib" ]; then + find lib -type l -exec rm {} \+ +fi # Build the package: -makepkg -l y -c n $TMP/aaa_glibc-solibs-$VERSION-$SLACKWARE_ARCH-$BUILD.txz +makepkg -l y -c n $TMP/aaa_glibc-solibs-${VERSION}${VERTAG}-$SLACKWARE_ARCH-${BUILD}${TAG}.txz # And finally, the complete "all-in-one" glibc package is created # from whatever was leftover: @@ -482,6 +546,9 @@ chown -R root:root etc chmod 755 etc/profile.d/* # Only scrub the links in /lib{,64} that will be created by ldconfig: find lib${LIBDIRSUFFIX} -type l -exec rm {} \+ +if [ "$MULTILIB" = "--enable-multilib" ]; then + find lib -type l -exec rm {} \+ +fi mkdir install cp -a $CWD/slack-desc.glibc install/slack-desc cp -a $CWD/doinst.sh-glibc install/doinst.sh @@ -519,8 +586,22 @@ fix_doinst # format: mv ld-linux*-${VERSION}.so ld-${VERSION}.so ) +if [ "$MULTILIB" = "--enable-multilib" ]; then + # We don't need to use an incoming directory here. + mkdir -p lib + cp -a $PKG/lib/* lib + ( cd lib + for cryptlib in libcrypt.so.* ; do + CRYPTSO=$(echo $cryptlib | cut -f 3 -d .) + mv $cryptlib libcrypt${CRYPTSO}-${VERSION}.so + done + for library in *.so.* ; do + mv $library $(echo $library | cut -f 1 -d .)-${VERSION}.so + done + ) +fi # Build the package: -/sbin/makepkg -l y -c n $TMP/glibc-$VERSION-$SLACKWARE_ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/glibc-${VERSION}${VERTAG}-$SLACKWARE_ARCH-${BUILD}${TAG}.txz # Done! echo diff --git a/source/l/glibmm2/glibmm2.SlackBuild b/source/l/glibmm2/glibmm2.SlackBuild index 7a89fc200..67079a73b 100755 --- a/source/l/glibmm2/glibmm2.SlackBuild +++ b/source/l/glibmm2/glibmm2.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -48,14 +48,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/gmime/gmime.SlackBuild b/source/l/gmime/gmime.SlackBuild index 2429c3033..5d84ecd29 100755 --- a/source/l/gmime/gmime.SlackBuild +++ b/source/l/gmime/gmime.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2006, 2007, 2008, 2009, 2010, 2018, 2022 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2018, 2022, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -92,7 +92,8 @@ CFLAGS="$SLKCFLAGS" \ --localstatedir=/var/lib \ --sysconfdir=/etc \ --mandir=/usr/man \ - --disable-gtk-doc \ + --enable-gtk-doc=no \ + --enable-gtk-doc-html=no \ --disable-static \ --program-prefix= \ --program-suffix= \ @@ -105,6 +106,9 @@ make install DESTDIR=$PKG || exit 1 # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la +# This thing just won't listen. +rm -rf $PKG/usr/share/gtk-doc + # 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 diff --git a/source/l/gmime/gmime.url b/source/l/gmime/gmime.url index 92b3e8877..907c3097c 100644 --- a/source/l/gmime/gmime.url +++ b/source/l/gmime/gmime.url @@ -1,2 +1,2 @@ https://github.com/jstedfast/gmime -https://github.com/jstedfast/gmime/releases/download/3.2.14/gmime-3.2.14.tar.xz +https://github.com/jstedfast/gmime/releases/download/3.2.15/gmime-3.2.15.tar.xz diff --git a/source/l/gobject-introspection/gobject-introspection.SlackBuild b/source/l/gobject-introspection/gobject-introspection.SlackBuild index f1b95dd9a..6612e10ef 100755 --- a/source/l/gobject-introspection/gobject-introspection.SlackBuild +++ b/source/l/gobject-introspection/gobject-introspection.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; @@ -50,24 +50,12 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mcpu=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/gobject-introspection/slack-desc b/source/l/gobject-introspection/slack-desc index 0826a8cd8..7fb398dce 100644 --- a/source/l/gobject-introspection/slack-desc +++ b/source/l/gobject-introspection/slack-desc @@ -13,7 +13,7 @@ gobject-introspection: introspection data of the API of C libraries. This intros gobject-introspection: can be used for automatic code generation for bindings, API gobject-introspection: verification, and documentation generation. gobject-introspection: -gobject-introspection: For more information, check out: -gobject-introspection: http://live.gnome.org/GObjectIntrospection +gobject-introspection: Homepage: https://gi.readthedocs.io/en/latest/ +gobject-introspection: gobject-introspection: gobject-introspection: diff --git a/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild b/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild index 1e55b33a5..f6fbb827e 100755 --- a/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild +++ b/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild @@ -31,7 +31,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -52,14 +52,11 @@ PKG=$TMP/package-$PKGNAM NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/gst-plugins-bad-free/fetch-sources.sh b/source/l/gst-plugins-bad-free/fetch-sources.sh index f3abff571..083cbaa26 100755 --- a/source/l/gst-plugins-bad-free/fetch-sources.sh +++ b/source/l/gst-plugins-bad-free/fetch-sources.sh @@ -26,7 +26,7 @@ # # Example: VERSION=1.18.5 ./fetch-sources.sh -VERSION=${VERSION:-1.24.1} +VERSION=${VERSION:-1.24.8} rm -rf rm -rf gst-plugins-bad-free-$VERSION gst-plugins-bad-$VERSION diff --git a/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild b/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild index 17d9735ba..ac38cd927 100755 --- a/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild +++ b/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild @@ -32,7 +32,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -44,17 +44,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/gst-plugins-base/gst-plugins-base.SlackBuild b/source/l/gst-plugins-base/gst-plugins-base.SlackBuild index 2221f7b70..9d5b53285 100755 --- a/source/l/gst-plugins-base/gst-plugins-base.SlackBuild +++ b/source/l/gst-plugins-base/gst-plugins-base.SlackBuild @@ -32,7 +32,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -52,17 +52,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild index 2171a194c..471013882 100755 --- a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild +++ b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild @@ -32,7 +32,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -44,17 +44,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/gst-plugins-libav/gst-plugins-libav.SlackBuild b/source/l/gst-plugins-libav/gst-plugins-libav.SlackBuild index fce74fbe7..b7eee091a 100755 --- a/source/l/gst-plugins-libav/gst-plugins-libav.SlackBuild +++ b/source/l/gst-plugins-libav/gst-plugins-libav.SlackBuild @@ -31,7 +31,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -51,17 +51,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/gstreamer/gstreamer.SlackBuild b/source/l/gstreamer/gstreamer.SlackBuild index 00a73dfad..a8db34f7f 100755 --- a/source/l/gstreamer/gstreamer.SlackBuild +++ b/source/l/gstreamer/gstreamer.SlackBuild @@ -31,7 +31,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -48,17 +48,11 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/gtk+/gtk+.SlackBuild b/source/l/gtk+/gtk+.SlackBuild index 6c03cabdf..54956b383 100755 --- a/source/l/gtk+/gtk+.SlackBuild +++ b/source/l/gtk+/gtk+.SlackBuild @@ -65,6 +65,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types" + cd $TMP rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 diff --git a/source/l/gtk+2/gtk+2.SlackBuild b/source/l/gtk+2/gtk+2.SlackBuild index a0ceb0f05..c5f8519c3 100755 --- a/source/l/gtk+2/gtk+2.SlackBuild +++ b/source/l/gtk+2/gtk+2.SlackBuild @@ -63,6 +63,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=implicit-int" + rm -rf $PKG mkdir -p $TMP $PKG/usr cd $TMP diff --git a/source/l/gtk4/gtk4.SlackBuild b/source/l/gtk4/gtk4.SlackBuild index 0e26a9b00..8de95cf1c 100755 --- a/source/l/gtk4/gtk4.SlackBuild +++ b/source/l/gtk4/gtk4.SlackBuild @@ -31,7 +31,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -49,14 +49,11 @@ fi TMP=${TMP:-/tmp} PKG=$TMP/package-gtk4 -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic -Wno-error=int-conversion" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/gtk4/gtk4.url b/source/l/gtk4/gtk4.url new file mode 100644 index 000000000..670a21666 --- /dev/null +++ b/source/l/gtk4/gtk4.url @@ -0,0 +1 @@ +https://gitlab.gnome.org/GNOME/gtk/-/archive/4.14.6/gtk-4.14.6.tar.gz diff --git a/source/l/gtkmm4/gtkmm4.SlackBuild b/source/l/gtkmm4/gtkmm4.SlackBuild index 2e5060740..258428ae4 100755 --- a/source/l/gtkmm4/gtkmm4.SlackBuild +++ b/source/l/gtkmm4/gtkmm4.SlackBuild @@ -31,7 +31,7 @@ SRCNAM=gtkmm if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -50,14 +50,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/gtksourceview3/gtksourceview3.SlackBuild b/source/l/gtksourceview3/gtksourceview3.SlackBuild index a16b6a2f2..ce47243f5 100755 --- a/source/l/gtksourceview3/gtksourceview3.SlackBuild +++ b/source/l/gtksourceview3/gtksourceview3.SlackBuild @@ -69,6 +69,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/l/gvfs/gvfs.SlackBuild b/source/l/gvfs/gvfs.SlackBuild index ae7e3ed2c..00f73af9e 100755 --- a/source/l/gvfs/gvfs.SlackBuild +++ b/source/l/gvfs/gvfs.SlackBuild @@ -31,7 +31,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; *) export ARCH=$( uname -m ) ;; esac @@ -48,14 +48,11 @@ fi TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/hicolor-icon-theme/hicolor-icon-theme.SlackBuild b/source/l/hicolor-icon-theme/hicolor-icon-theme.SlackBuild index 3eaf5cc85..f7a434281 100755 --- a/source/l/hicolor-icon-theme/hicolor-icon-theme.SlackBuild +++ b/source/l/hicolor-icon-theme/hicolor-icon-theme.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2014, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2014, 2018, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=hicolor-icon-theme -VERSION=${VERSION:-0.17} +VERSION=${VERSION:-0.18} ARCH=noarch -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # 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 @@ -51,11 +51,17 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -./configure \ - --prefix=/usr - -make || exit 1 -make install DESTDIR=$PKG || exit 1 +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ + --prefix=/usr \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. mkdir -p $PKG/var/log/setup cat $CWD/setup.08.gtk-update-icon-cache > $PKG/var/log/setup/setup.08.gtk-update-icon-cache @@ -63,7 +69,7 @@ chmod 0755 $PKG/var/log/setup/setup.08.gtk-update-icon-cache mkdir -p $PKG/usr/doc/hicolor-icon-theme-$VERSION cp -a \ - COPYING NEWS README \ + COPYING* NEWS* README* \ $PKG/usr/doc/hicolor-icon-theme-$VERSION chmod 0644 $PKG/usr/doc/hicolor-icon-theme-$VERSION/* @@ -73,4 +79,3 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/hicolor-icon-theme-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/l/imagemagick/imagemagick.SlackBuild b/source/l/imagemagick/imagemagick.SlackBuild index c1fb53430..f62ef83d5 100755 --- a/source/l/imagemagick/imagemagick.SlackBuild +++ b/source/l/imagemagick/imagemagick.SlackBuild @@ -48,7 +48,7 @@ POLICY=${POLICY:-limited} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -65,14 +65,11 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -121,7 +118,7 @@ CXXFLAGS="$SLKCFLAGS" \ --with-fftw \ --with-gcc-arch=$ARCH \ --with-perl \ - --with-perl-options="INSTALLDIRS=vendor" \ + --with-perl-options="INSTALLDIRS=vendor INSTALL_BASE=" \ --with-rsvg \ --with-security-policy=$POLICY \ --build=$ARCH-slackware-linux || exit 1 diff --git a/source/l/isl/isl.SlackBuild b/source/l/isl/isl.SlackBuild index bc5dd15dc..2f7622cb3 100755 --- a/source/l/isl/isl.SlackBuild +++ b/source/l/isl/isl.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -47,21 +47,12 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/iso-codes/iso-codes.url b/source/l/iso-codes/iso-codes.url new file mode 100644 index 000000000..9bf9891cc --- /dev/null +++ b/source/l/iso-codes/iso-codes.url @@ -0,0 +1 @@ +https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v4.17.0/iso-codes-v4.17.0.tar.gz diff --git a/source/l/jasper/jasper.url b/source/l/jasper/jasper.url index b648f6121..1b6ad64ad 100644 --- a/source/l/jasper/jasper.url +++ b/source/l/jasper/jasper.url @@ -1,2 +1,2 @@ https://github.com/jasper-software/jasper/releases -https://github.com/jasper-software/jasper/releases/download/version-4.2.2/jasper-4.2.2.tar.gz +https://github.com/jasper-software/jasper/releases/download/version-4.2.4/jasper-4.2.4.tar.gz diff --git a/source/l/json-c/json-c.SlackBuild b/source/l/json-c/json-c.SlackBuild index 4764c7dfb..b66a396d9 100755 --- a/source/l/json-c/json-c.SlackBuild +++ b/source/l/json-c/json-c.SlackBuild @@ -33,8 +33,7 @@ BUILD=${BUILD:-1} MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$MARCH ;; @@ -54,14 +53,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/json-glib/json-glib.SlackBuild b/source/l/json-glib/json-glib.SlackBuild index 0fc1c440b..acbc47a73 100755 --- a/source/l/json-glib/json-glib.SlackBuild +++ b/source/l/json-glib/json-glib.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -47,21 +47,12 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/lame/lame.SlackBuild b/source/l/lame/lame.SlackBuild index c41b6d436..8cef5ed1c 100755 --- a/source/l/lame/lame.SlackBuild +++ b/source/l/lame/lame.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=lame VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/lcms/lcms.SlackBuild b/source/l/lcms/lcms.SlackBuild index 4bd50d511..638a54832 100755 --- a/source/l/lcms/lcms.SlackBuild +++ b/source/l/lcms/lcms.SlackBuild @@ -60,6 +60,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types" + TMP=${TMP:-/tmp} PKG=$TMP/package-lcms diff --git a/source/l/lensfun/lensfun.SlackBuild b/source/l/lensfun/lensfun.SlackBuild index ebd1d28b6..00377fee5 100755 --- a/source/l/lensfun/lensfun.SlackBuild +++ b/source/l/lensfun/lensfun.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=lensfun VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libao/libao.SlackBuild b/source/l/libao/libao.SlackBuild index 05449dd4c..9faddbd11 100755 --- a/source/l/libao/libao.SlackBuild +++ b/source/l/libao/libao.SlackBuild @@ -44,6 +44,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + # If this package is being built for ALSA (no PulseAudio), use the _alsa $TAG: if [ ! -r /usr/lib${LIBDIRSUFFIX}/pkgconfig/libpulse.pc ]; then TAG="_alsa" @@ -73,8 +76,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +CFLAGS="$SLKCFLAGS" \ ./autogen.sh || exit 1 +CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/source/l/libappindicator/libappindicator.SlackBuild b/source/l/libappindicator/libappindicator.SlackBuild index 649589179..fe5998e53 100755 --- a/source/l/libappindicator/libappindicator.SlackBuild +++ b/source/l/libappindicator/libappindicator.SlackBuild @@ -68,6 +68,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/l/libarchive/libarchive.SlackBuild b/source/l/libarchive/libarchive.SlackBuild index 341389530..8f2ee81bc 100755 --- a/source/l/libarchive/libarchive.SlackBuild +++ b/source/l/libarchive/libarchive.SlackBuild @@ -32,7 +32,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -52,14 +52,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/libarchive/libarchive.url b/source/l/libarchive/libarchive.url index 8d0614b9e..6253a41f7 100644 --- a/source/l/libarchive/libarchive.url +++ b/source/l/libarchive/libarchive.url @@ -1 +1,2 @@ https://github.com/libarchive/libarchive +https://github.com/libarchive/libarchive/releases/download/v3.7.5/libarchive-3.7.5.tar.xz diff --git a/source/l/libass/libass.SlackBuild b/source/l/libass/libass.SlackBuild index a18f45657..3faf80af7 100755 --- a/source/l/libass/libass.SlackBuild +++ b/source/l/libass/libass.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libass VERSION=${VERSION:-$(echo libass-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libcaca/libcaca.SlackBuild b/source/l/libcaca/libcaca.SlackBuild index 6c039313c..6fbc91be7 100755 --- a/source/l/libcaca/libcaca.SlackBuild +++ b/source/l/libcaca/libcaca.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libcaca VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libcap-ng/30453b6553948cd05c438f9f509013e3bb84f25b.patch b/source/l/libcap-ng/30453b6553948cd05c438f9f509013e3bb84f25b.patch deleted file mode 100644 index 4cd8e9fc1..000000000 --- a/source/l/libcap-ng/30453b6553948cd05c438f9f509013e3bb84f25b.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 30453b6553948cd05c438f9f509013e3bb84f25b -Author: Steve Grubb <ausearch.1@gmail.com> -Date: Thu Jan 4 15:06:29 2024 -0500 - - Remove python global exception handler since its deprecated - -diff --git a/bindings/src/capng_swig.i b/bindings/src/capng_swig.i -index fcdaf18..fa85e13 100644 ---- a/bindings/src/capng_swig.i -+++ b/bindings/src/capng_swig.i -@@ -30,13 +30,6 @@ - - %varargs(16, signed capability = 0) capng_updatev; - --%except(python) { -- $action -- if (result < 0) { -- PyErr_SetFromErrno(PyExc_OSError); -- return NULL; -- } --} - #endif - - %define __signed__ - diff --git a/source/l/libcap-ng/libcap-ng.SlackBuild b/source/l/libcap-ng/libcap-ng.SlackBuild index 11c0ce096..5528f4896 100755 --- a/source/l/libcap-ng/libcap-ng.SlackBuild +++ b/source/l/libcap-ng/libcap-ng.SlackBuild @@ -85,11 +85,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Patch for swig-4.2.0: -cat $CWD/30453b6553948cd05c438f9f509013e3bb84f25b.patch | patch -p1 --verbose || exit 1 - -autoreconf -vif - # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/l/libcddb/libcddb.SlackBuild b/source/l/libcddb/libcddb.SlackBuild index 3ad6a3a73..ad267d6a6 100755 --- a/source/l/libcddb/libcddb.SlackBuild +++ b/source/l/libcddb/libcddb.SlackBuild @@ -65,6 +65,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types" + cd $TMP rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 diff --git a/source/l/libcdio-paranoia/libcdio-paranoia.SlackBuild b/source/l/libcdio-paranoia/libcdio-paranoia.SlackBuild index a90cc1e11..30e0e7375 100755 --- a/source/l/libcdio-paranoia/libcdio-paranoia.SlackBuild +++ b/source/l/libcdio-paranoia/libcdio-paranoia.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libcdio-paranoia VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -33,7 +33,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; armv7hl) export ARCH=$MARCH ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: @@ -49,14 +49,14 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" elif [ "$ARCH" = "armv7hl" ]; then SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" diff --git a/source/l/libcdio/libcdio.SlackBuild b/source/l/libcdio/libcdio.SlackBuild index 71a3117b5..3127dd18c 100755 --- a/source/l/libcdio/libcdio.SlackBuild +++ b/source/l/libcdio/libcdio.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libcdio VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/libclc b/source/l/libclc new file mode 120000 index 000000000..d6c3969ca --- /dev/null +++ b/source/l/libclc @@ -0,0 +1 @@ +../d/llvm
\ No newline at end of file diff --git a/source/l/libclc/libclc.SlackBuild b/source/l/libclc/libclc.SlackBuild deleted file mode 100755 index ba739d762..000000000 --- a/source/l/libclc/libclc.SlackBuild +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/bash - -# Slackware build script for libclc - -# Copyright 2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2017, 2018, 2021 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) - -PKGNAM=libclc -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 4- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -# Automatically determine the architecture we're building on: -MARCH=$( uname -m ) -if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; - 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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -TMP=${TMP:-/tmp} -PKG=$TMP/package-libclc - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf libclc-${VERSION}.src -tar xvf $CWD/libclc-$VERSION.src.tar.?z || exit 1 -cd libclc-${VERSION}.src || 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 {} \+ - -# Configure, build, and install: -mkdir cmake-build -cd cmake-build - cmake \ - -DCMAKE_C_FLAGS="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX="$LIBDIRSUFFIX" \ - -DDOC_INSTALL_DIR="doc" \ - -DMAN_INSTALL_DIR=/usr/man \ - .. || exit 1 - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 -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/$PKGNAM-$VERSION -cp -a *.TXT $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/libclc/libclc.url b/source/l/libclc/libclc.url deleted file mode 100644 index ae4394d3c..000000000 --- a/source/l/libclc/libclc.url +++ /dev/null @@ -1 +0,0 @@ -https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/libclc-18.1.2.src.tar.xz diff --git a/source/l/libcupsfilters/libcupsfilters.SlackBuild b/source/l/libcupsfilters/libcupsfilters.SlackBuild new file mode 100755 index 000000000..6947cb16a --- /dev/null +++ b/source/l/libcupsfilters/libcupsfilters.SlackBuild @@ -0,0 +1,146 @@ +#!/bin/bash + +# Copyright 2024 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=libcupsfilters +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$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 {} \+ + +# Configure, build, and install: +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi +fi +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --disable-static \ + --disable-mutool \ + --build=$ARCH-slackware-linux || exit 1 +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +# 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 + +# Compress manual pages: +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 a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + ABOUT-NLS* AUTHORS* CHANGES* CONTRIBUTING* COPYING* ChangeLog* DEVELOPING* INSTALL* LICENSE* NEWS* NOTICE* README* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a CHANGES.md file, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r CHANGES.md ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat CHANGES.md | head -n 1000 > $DOCSDIR/CHANGES.md + touch -r CHANGES.md $DOCSDIR/CHANGES.md +fi + +# Nope: +rm -f $PKG/usr/doc/${PKGNAM}-$VERSION/CHANGES-1.x* + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/libcupsfilters/libcupsfilters.url b/source/l/libcupsfilters/libcupsfilters.url new file mode 100644 index 000000000..d66e242be --- /dev/null +++ b/source/l/libcupsfilters/libcupsfilters.url @@ -0,0 +1 @@ +https://github.com/OpenPrinting/libcupsfilters diff --git a/source/l/libcupsfilters/slack-desc b/source/l/libcupsfilters/slack-desc new file mode 100644 index 000000000..1accff3be --- /dev/null +++ b/source/l/libcupsfilters/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------------------------------------------------------| +libcupsfilters: libcupsfilters (printer filter library) +libcupsfilters: +libcupsfilters: This package provides the libcupsfilters library which contains all +libcupsfilters: the code of the filters of the former cups-filters package as library +libcupsfilters: functions, the so-called filter functions. +libcupsfilters: +libcupsfilters: Homepage: http://www.openprinting.org +libcupsfilters: +libcupsfilters: +libcupsfilters: +libcupsfilters: diff --git a/source/l/libdeflate/libdeflate.SlackBuild b/source/l/libdeflate/libdeflate.SlackBuild index b6f350bb9..c9710593c 100755 --- a/source/l/libdeflate/libdeflate.SlackBuild +++ b/source/l/libdeflate/libdeflate.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -47,21 +47,12 @@ fi NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/libedit/libedit.SlackBuild b/source/l/libedit/libedit.SlackBuild index 42c57c319..c4f00d386 100755 --- a/source/l/libedit/libedit.SlackBuild +++ b/source/l/libedit/libedit.SlackBuild @@ -36,8 +36,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$MARCH ;; @@ -52,18 +51,12 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/libgnt/libgnt.SlackBuild b/source/l/libgnt/libgnt.SlackBuild index 913d0d90c..f348eaf60 100755 --- a/source/l/libgnt/libgnt.SlackBuild +++ b/source/l/libgnt/libgnt.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libgnt -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -f 2- -d - | rev | cut -f 3- -d . | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -42,7 +42,7 @@ fi # 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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + echo "$PKGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz" exit 0 fi @@ -134,5 +134,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz diff --git a/source/l/libgpod/libgpod.SlackBuild b/source/l/libgpod/libgpod.SlackBuild index 599c4257f..f180e9247 100755 --- a/source/l/libgpod/libgpod.SlackBuild +++ b/source/l/libgpod/libgpod.SlackBuild @@ -65,6 +65,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=implicit-int" + cd $TMP rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 diff --git a/source/l/libgtop/libgtop.SlackBuild b/source/l/libgtop/libgtop.SlackBuild index 5ea610bdb..41289a994 100755 --- a/source/l/libgtop/libgtop.SlackBuild +++ b/source/l/libgtop/libgtop.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2020, 2021, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libgtop VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -90,6 +90,7 @@ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/lib${LIBDIRSUFFIX}/libgtop \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ diff --git a/source/l/libical/libical.SlackBuild b/source/l/libical/libical.SlackBuild index f8e67a2d1..3dff49df5 100755 --- a/source/l/libical/libical.SlackBuild +++ b/source/l/libical/libical.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libical VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libieee1284/libieee1284.SlackBuild b/source/l/libieee1284/libieee1284.SlackBuild index 65397a04b..357ebe7ce 100755 --- a/source/l/libieee1284/libieee1284.SlackBuild +++ b/source/l/libieee1284/libieee1284.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libieee1284 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-7} +BUILD=${BUILD:-8} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libimobiledevice/libimobiledevice.SlackBuild b/source/l/libimobiledevice/libimobiledevice.SlackBuild index d02786674..2c7e6d21b 100755 --- a/source/l/libimobiledevice/libimobiledevice.SlackBuild +++ b/source/l/libimobiledevice/libimobiledevice.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libimobiledevice VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild b/source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild index 5a552530a..8fe3aed2c 100755 --- a/source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild +++ b/source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -47,27 +47,12 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i386" ]; then - SLKCFLAGS="-O2 -march=i386 -mcpu=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/libmcrypt/libmcrypt.SlackBuild b/source/l/libmcrypt/libmcrypt.SlackBuild index a20faa0d2..0f71b6c03 100755 --- a/source/l/libmcrypt/libmcrypt.SlackBuild +++ b/source/l/libmcrypt/libmcrypt.SlackBuild @@ -65,6 +65,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration -Wno-error=implicit-int" + cd $TMP rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 diff --git a/source/l/libnjb/libnjb.SlackBuild b/source/l/libnjb/libnjb.SlackBuild index 98784d44f..3b6a3ee0a 100755 --- a/source/l/libnjb/libnjb.SlackBuild +++ b/source/l/libnjb/libnjb.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libnjb VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libnl3/libnl.url b/source/l/libnl3/libnl.url index 16c66d215..7084f2cd7 100644 --- a/source/l/libnl3/libnl.url +++ b/source/l/libnl3/libnl.url @@ -1,2 +1,2 @@ https://github.com/thom311/libnl -https://github.com/thom311/libnl/releases/download/libnl3_9_0/libnl-3.9.0.tar.gz +https://github.com/thom311/libnl/releases/download/libnl3_10_0/libnl-3.10.0.tar.gz diff --git a/source/l/libnl3/libnl3.SlackBuild b/source/l/libnl3/libnl3.SlackBuild index 6e11e9699..4b43df390 100755 --- a/source/l/libnl3/libnl3.SlackBuild +++ b/source/l/libnl3/libnl3.SlackBuild @@ -31,7 +31,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -54,10 +54,10 @@ if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/libnvme/libnvme.SlackBuild b/source/l/libnvme/libnvme.SlackBuild index f9387ff96..021069aff 100755 --- a/source/l/libnvme/libnvme.SlackBuild +++ b/source/l/libnvme/libnvme.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -47,21 +47,12 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/libpcap/libpcap.SlackBuild b/source/l/libpcap/libpcap.SlackBuild index 7655597e2..56e19854a 100755 --- a/source/l/libpcap/libpcap.SlackBuild +++ b/source/l/libpcap/libpcap.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; diff --git a/source/l/libplacebo/libplacebo.SlackBuild b/source/l/libplacebo/libplacebo.SlackBuild index 50b411da6..fe2c73990 100755 --- a/source/l/libplacebo/libplacebo.SlackBuild +++ b/source/l/libplacebo/libplacebo.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -45,14 +45,11 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/libpng/libpng.SlackBuild b/source/l/libpng/libpng.SlackBuild index f3a84ea9b..2cf29e2e5 100755 --- a/source/l/libpng/libpng.SlackBuild +++ b/source/l/libpng/libpng.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -47,27 +47,12 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i386" ]; then - SLKCFLAGS="-O2 -march=i386 -mcpu=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/libppd/libppd.SlackBuild b/source/l/libppd/libppd.SlackBuild new file mode 100755 index 000000000..2c8c7e75f --- /dev/null +++ b/source/l/libppd/libppd.SlackBuild @@ -0,0 +1,147 @@ +#!/bin/bash + +# Copyright 2024 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=libppd +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$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 {} \+ + +# Configure, build, and install: +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi +fi +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --mandir=/usr/man \ + --disable-static \ + --disable-mutool \ + --with-cups-rundir=/run/cups \ + --enable-ppdc-utils \ + --build=$ARCH-slackware-linux || exit 1 +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +# 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 + +# Compress manual pages: +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 a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS* CHANGES.md COPYING* DEVELOPING* INSTALL* LICENSE* NEWS* NOTICE* README* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a CHANGES.md file, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r CHANGES.md ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat CHANGES.md | head -n 1000 > $DOCSDIR/CHANGES.md + touch -r CHANGES.md $DOCSDIR/CHANGES.md +fi + +# Nope: +rm -f $PKG/usr/doc/${PKGNAM}-$VERSION/CHANGES-1.x* + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/libppd/libppd.url b/source/l/libppd/libppd.url new file mode 100644 index 000000000..9aec2b08d --- /dev/null +++ b/source/l/libppd/libppd.url @@ -0,0 +1 @@ +https://github.com/OpenPrinting/libppd diff --git a/source/l/libclc/slack-desc b/source/l/libppd/slack-desc index 12a032243..c1661aaec 100644 --- a/source/l/libclc/slack-desc +++ b/source/l/libppd/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -libclc: libclc (OpenCL 1.1 libraries) -libclc: -libclc: libclc is an open source, BSD/MIT dual licensed implementation of the -libclc: library requirements of the OpenCL C programming language, as -libclc: specified by the OpenCL 1.1 Specification. -libclc: -libclc: Homepage: http://libclc.llvm.org/ -libclc: -libclc: -libclc: -libclc: +libppd: libppd (legacy printer driver library) +libppd: +libppd: libppd is the legacy support library for PPD files, taking over these +libppd: functions from libcups and CUPS' PPD compiler. +libppd: +libppd: Homepage: http://www.openprinting.org +libppd: +libppd: +libppd: +libppd: +libppd: diff --git a/source/l/libproxy/libproxy.SlackBuild b/source/l/libproxy/libproxy.SlackBuild index 8c8013234..f72caf96f 100755 --- a/source/l/libproxy/libproxy.SlackBuild +++ b/source/l/libproxy/libproxy.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2009, 2010, 2011 Robby Workman Northport, AL, USA -# Copyright 2013, 2018, 2023 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2013, 2018, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,11 +25,11 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libproxy VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -52,19 +52,16 @@ if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi -PYTHONLIB=$( python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' ) -PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' ) - rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -102,12 +99,6 @@ meson setup \ DESTDIR=$PKG $NINJA install || exit 1 cd .. -## Generate .pyc files -#python -m compileall "${PKG}$PYTHONLIB" -#python -O -m compileall "${PKG}$PYTHONLIB" -#python3 -m compileall "${PKG}$PYTHON3LIB" -#python3 -O -m compileall "${PKG}$PYTHON3LIB" - 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/source/l/libqalculate/libqalculate.SlackBuild b/source/l/libqalculate/libqalculate.SlackBuild index 4984f81f0..b49cbf620 100755 --- a/source/l/libqalculate/libqalculate.SlackBuild +++ b/source/l/libqalculate/libqalculate.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libqalculate VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/librsvg/librsvg.SlackBuild b/source/l/librsvg/librsvg.SlackBuild index 28400d22a..919199e8a 100755 --- a/source/l/librsvg/librsvg.SlackBuild +++ b/source/l/librsvg/librsvg.SlackBuild @@ -28,7 +28,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -45,14 +45,11 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/libseccomp/libseccomp.SlackBuild b/source/l/libseccomp/libseccomp.SlackBuild index 5ab046097..b2b2abd82 100755 --- a/source/l/libseccomp/libseccomp.SlackBuild +++ b/source/l/libseccomp/libseccomp.SlackBuild @@ -103,7 +103,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --enable-static=no \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/libsoup3/libsoup3.SlackBuild b/source/l/libsoup3/libsoup3.SlackBuild index 5c60e14f8..2b529837b 100755 --- a/source/l/libsoup3/libsoup3.SlackBuild +++ b/source/l/libsoup3/libsoup3.SlackBuild @@ -32,7 +32,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -51,14 +51,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -93,6 +90,7 @@ unshare -n meson setup \ --buildtype=release \ -Dgssapi=disabled \ -Dvapi=enabled \ + -Ddocs=disabled \ .. || exit 1 "${NINJA:=ninja}" $NUMJOBS || exit 1 DESTDIR=$PKG $NINJA install || exit 1 diff --git a/source/l/libssh/libssh.SlackBuild b/source/l/libssh/libssh.SlackBuild index 12176d972..5e9655ba3 100755 --- a/source/l/libssh/libssh.SlackBuild +++ b/source/l/libssh/libssh.SlackBuild @@ -33,8 +33,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$MARCH ;; @@ -49,18 +48,12 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -99,7 +92,7 @@ cd build -DWITH_SERVER=1 \ -DWITH_STATIC_LIB=0 \ .. || exit 1 - make $NUMJOBS VERBOSE=1 || make || exit 1 + make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 cd - diff --git a/source/l/libtiff/libtiff.SlackBuild b/source/l/libtiff/libtiff.SlackBuild index 4ef8eb2d4..8590144d7 100755 --- a/source/l/libtiff/libtiff.SlackBuild +++ b/source/l/libtiff/libtiff.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -46,17 +46,11 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i386" ]; then - SLKCFLAGS="-O2 -march=i386 -mcpu=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/libunwind/libunwind.SlackBuild b/source/l/libunwind/libunwind.SlackBuild index 73a29d7ad..6f610aacc 100755 --- a/source/l/libunwind/libunwind.SlackBuild +++ b/source/l/libunwind/libunwind.SlackBuild @@ -86,6 +86,13 @@ find . \ -exec chmod 644 {} \+ # Configure: +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi +fi CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -104,6 +111,9 @@ make install DESTDIR=$PKG || exit 1 # Don't ship .la files: rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la +# Don't ship this stuff, either: +rm -r $PKG/usr/libexec + # Nuke any .a files that shouldn't have been installed: rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a @@ -119,7 +129,7 @@ touch -r NEWS $PKG/usr/include/libunwind.h # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - AUTHORS COPYING* ChangeLog NEWS README* TODO \ + AUTHORS* COPYING* ChangeLog NEWS* README* TODO* \ $PKG/usr/doc/${PKGNAM}-$VERSION # If there's a ChangeLog, installing at least part of the recent history @@ -158,4 +168,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/l/liburing/liburing.SlackBuild b/source/l/liburing/liburing.SlackBuild index ad64ab05e..e85d7f294 100755 --- a/source/l/liburing/liburing.SlackBuild +++ b/source/l/liburing/liburing.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -47,21 +47,12 @@ fi NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/libwebp/libwebp.SlackBuild b/source/l/libwebp/libwebp.SlackBuild index 043553ac5..0cde53d37 100755 --- a/source/l/libwebp/libwebp.SlackBuild +++ b/source/l/libwebp/libwebp.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libwebp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libxml2/libxml2.SlackBuild b/source/l/libxml2/libxml2.SlackBuild index fae202b3a..48a454545 100755 --- a/source/l/libxml2/libxml2.SlackBuild +++ b/source/l/libxml2/libxml2.SlackBuild @@ -24,12 +24,12 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libxml2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -46,14 +46,11 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/libxslt/libxslt.SlackBuild b/source/l/libxslt/libxslt.SlackBuild index 2e735ac94..3ee74f2d5 100755 --- a/source/l/libxslt/libxslt.SlackBuild +++ b/source/l/libxslt/libxslt.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2012, 2013, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2012, 2013, 2016, 2017, 2018, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -73,10 +73,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# This header isn't shipped in glibc >= 2.26 anymore. See: -# https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 -sed -i '/#include <xlocale.h>/d' libxslt/xsltlocale.h - # Be a bit more generous with xsltMaxDepth to avoid false positive # on infinite recursion: zcat $CWD/libxslt.xsltMaxDepth.diff.gz | patch -p1 --verbose || exit 1 @@ -144,4 +140,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $TMP/libxslt-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/l/libzip/libzip.SlackBuild b/source/l/libzip/libzip.SlackBuild index 62d41cc41..686d8fa98 100755 --- a/source/l/libzip/libzip.SlackBuild +++ b/source/l/libzip/libzip.SlackBuild @@ -32,7 +32,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -52,14 +52,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-libzip -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/lmdb/lmdb.url b/source/l/lmdb/lmdb.url index 191ce7736..c2f259b7a 100644 --- a/source/l/lmdb/lmdb.url +++ b/source/l/lmdb/lmdb.url @@ -1,2 +1,2 @@ #https://github.com/LMDB/lmdb -https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.32/openldap-LMDB_0.9.32.tar.gz +https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.33/openldap-LMDB_0.9.33.tar.gz diff --git a/source/l/lz4/lz4.SlackBuild b/source/l/lz4/lz4.SlackBuild index d2f3fa8c8..1f4b983d4 100755 --- a/source/l/lz4/lz4.SlackBuild +++ b/source/l/lz4/lz4.SlackBuild @@ -30,21 +30,21 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -80,7 +80,6 @@ find . \ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS \ PREFIX=/usr \ - LIBDIR=/usr/lib$LIBDIRSUFFIX \ MANDIR=/usr/man \ BUILD_STATIC=no || exit 1 diff --git a/source/l/mlt/mlt.SlackBuild b/source/l/mlt/mlt.SlackBuild index 8a688f399..3bdf8d378 100755 --- a/source/l/mlt/mlt.SlackBuild +++ b/source/l/mlt/mlt.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2021, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,12 +24,12 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mlt VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -47,21 +47,12 @@ fi NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -93,6 +84,10 @@ cd cmake-build -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_MANDIR=/usr/man \ + -DMOD_QT=ON \ + -DMOD_GLXANIMATE=ON \ + -DMOD_QT6=ON \ + -DMOD_GLXANIMATE_QT6=ON \ .. || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild index 49e0c23e5..ea32d8ae4 100755 --- a/source/l/mozilla-nss/mozilla-nss.SlackBuild +++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mozilla-nss SRCNAM=nss -VERSION=${VERSION:-3.99} +VERSION=${VERSION:-3.104} NSPR=${NSPR:-4.35} BUILD=${BUILD:-1} @@ -34,8 +34,7 @@ BUILD=${BUILD:-1} MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$MARCH ;; @@ -50,16 +49,13 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" export USE_64=1 -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/mozjs115/double_t.x86.diff b/source/l/mozjs115/double_t.x86.diff deleted file mode 100644 index 9030adfe8..000000000 --- a/source/l/mozjs115/double_t.x86.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- ./modules/fdlibm/src/math_private.h.orig 2024-03-19 18:53:52.828031985 -0500 -+++ ./modules/fdlibm/src/math_private.h 2024-03-19 18:55:57.193034767 -0500 -@@ -30,8 +30,8 @@ - * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t - */ - --typedef double __double_t; --typedef __double_t double_t; -+typedef long double __double_t; -+typedef long double double_t; - typedef float __float_t; - - /* diff --git a/source/l/mozjs115/patches/tests-increase-timeout.patch b/source/l/mozjs115/patches/tests-increase-timeout.patch deleted file mode 100644 index 2ba725ce9..000000000 --- a/source/l/mozjs115/patches/tests-increase-timeout.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9be85b155c6df0454c5faef9e850f572c99e3615 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com> -Date: Wed, 15 Jul 2020 08:32:44 +0200 -Subject: [PATCH] Increase the test timeout for slower buildds - -Ported forward from Debian: https://bugs.debian.org/878284 ---- - js/src/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js/src/Makefile.in b/js/src/Makefile.in -index 6daed72..16db2de 100644 ---- a/js/src/Makefile.in -+++ b/js/src/Makefile.in -@@ -53,7 +53,7 @@ check:: check-js-msg - - check-jstests: - $(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON3) -u $(srcdir)/tests/jstests.py \ -- --no-progress --format=automation --timeout 300 \ -+ --no-progress --format=automation --timeout 600 \ - $(JSTESTS_EXTRA_ARGS) \ - $(DIST)/bin/js$(BIN_SUFFIX) - --- -2.37.1 - diff --git a/source/l/mozjs115/autoconf/autoconf-2.13-consolidated_fixes-1.patch b/source/l/mozjs128/autoconf/autoconf-2.13-consolidated_fixes-1.patch index 5e7b23113..5e7b23113 100644 --- a/source/l/mozjs115/autoconf/autoconf-2.13-consolidated_fixes-1.patch +++ b/source/l/mozjs128/autoconf/autoconf-2.13-consolidated_fixes-1.patch diff --git a/source/l/mozjs115/autoconf/autoconf.build b/source/l/mozjs128/autoconf/autoconf.build index 05e53f1a5..05e53f1a5 100755 --- a/source/l/mozjs115/autoconf/autoconf.build +++ b/source/l/mozjs128/autoconf/autoconf.build diff --git a/source/l/mozjs115/mozjs115.SlackBuild b/source/l/mozjs128/mozjs128.SlackBuild index 21751f2a0..013ae7692 100755 --- a/source/l/mozjs115/mozjs115.SlackBuild +++ b/source/l/mozjs128/mozjs128.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=mozjs115 +PKGNAM=mozjs128 SRCNAME=firefox VERSION=$(basename $(ls $SRCNAME-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source) BUILD=${BUILD:-1} @@ -54,14 +54,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -96,7 +93,6 @@ PATH=$TMP/autoconf-tmp/usr/bin:$PATH # Patches from Fedora: zcat $CWD/patches/fix-soname.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/copy-headers.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/tests-increase-timeout.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/icu_sources_data-Write-command-output-to-our-stderr.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/emitter.patch.gz | patch -p1 --verbose || exit 1 @@ -105,11 +101,6 @@ zcat $CWD/patches/0001-Skip-failing-tests-on-ppc64-and-s390x.patch.gz | patch -p zcat $CWD/patches/remove-sloppy-m4-detection-from-bundled-autoconf.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/spidermonkey_checks_disable.patch.gz | patch -p1 --verbose || exit 1 -# Fix header mismatch on x86 with GCC: -if [ "$ARCH" = "i686" ]; then - zcat $CWD/double_t.x86.diff.gz | patch -p1 --verbose || exit 1 -fi - # Remove bundled zlib directory and use system version: rm -rf modules/zlib diff --git a/source/l/mozjs115/patches/0001-Skip-failing-tests-on-ppc64-and-s390x.patch b/source/l/mozjs128/patches/0001-Skip-failing-tests-on-ppc64-and-s390x.patch index 5c2866473..5c2866473 100644 --- a/source/l/mozjs115/patches/0001-Skip-failing-tests-on-ppc64-and-s390x.patch +++ b/source/l/mozjs128/patches/0001-Skip-failing-tests-on-ppc64-and-s390x.patch diff --git a/source/l/mozjs115/patches/copy-headers.patch b/source/l/mozjs128/patches/copy-headers.patch index dfddcfaee..dfddcfaee 100644 --- a/source/l/mozjs115/patches/copy-headers.patch +++ b/source/l/mozjs128/patches/copy-headers.patch diff --git a/source/l/mozjs115/patches/emitter.patch b/source/l/mozjs128/patches/emitter.patch index 8d5aafb15..8d5aafb15 100644 --- a/source/l/mozjs115/patches/emitter.patch +++ b/source/l/mozjs128/patches/emitter.patch diff --git a/source/l/mozjs115/patches/fix-soname.patch b/source/l/mozjs128/patches/fix-soname.patch index 832326489..832326489 100644 --- a/source/l/mozjs115/patches/fix-soname.patch +++ b/source/l/mozjs128/patches/fix-soname.patch diff --git a/source/l/mozjs115/patches/icu_sources_data-Write-command-output-to-our-stderr.patch b/source/l/mozjs128/patches/icu_sources_data-Write-command-output-to-our-stderr.patch index 84684250c..84684250c 100644 --- a/source/l/mozjs115/patches/icu_sources_data-Write-command-output-to-our-stderr.patch +++ b/source/l/mozjs128/patches/icu_sources_data-Write-command-output-to-our-stderr.patch diff --git a/source/l/mozjs115/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch b/source/l/mozjs128/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch index 8572c21fd..8572c21fd 100644 --- a/source/l/mozjs115/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch +++ b/source/l/mozjs128/patches/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch diff --git a/source/l/mozjs115/patches/init_patch.patch b/source/l/mozjs128/patches/init_patch.patch index 28ed1d31a..28ed1d31a 100644 --- a/source/l/mozjs115/patches/init_patch.patch +++ b/source/l/mozjs128/patches/init_patch.patch diff --git a/source/l/mozjs115/patches/remove-sloppy-m4-detection-from-bundled-autoconf.patch b/source/l/mozjs128/patches/remove-sloppy-m4-detection-from-bundled-autoconf.patch index 10b8b16ea..10b8b16ea 100644 --- a/source/l/mozjs115/patches/remove-sloppy-m4-detection-from-bundled-autoconf.patch +++ b/source/l/mozjs128/patches/remove-sloppy-m4-detection-from-bundled-autoconf.patch diff --git a/source/l/mozjs115/patches/spidermonkey_checks_disable.patch b/source/l/mozjs128/patches/spidermonkey_checks_disable.patch index 451d3eef4..451d3eef4 100644 --- a/source/l/mozjs115/patches/spidermonkey_checks_disable.patch +++ b/source/l/mozjs128/patches/spidermonkey_checks_disable.patch diff --git a/source/l/mozjs115/slack-desc b/source/l/mozjs128/slack-desc index 155713c30..78d037a63 100644 --- a/source/l/mozjs115/slack-desc +++ b/source/l/mozjs128/slack-desc @@ -6,15 +6,15 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -mozjs115: mozjs115 (Mozilla's JavaScript Engine) -mozjs115: -mozjs115: SpiderMonkey is Mozilla's JavaScript engine written in C/C++. It is -mozjs115: used in various Mozilla products (including Firefox) and is available -mozjs115: under MPL/GPL/LGPL tri-license. -mozjs115: -mozjs115: Homepage: -mozjs115: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey -mozjs115: -mozjs115: -mozjs115: -mozjs115: +mozjs128: mozjs128 (Mozilla's JavaScript Engine) +mozjs128: +mozjs128: SpiderMonkey is Mozilla's JavaScript engine written in C/C++. It is +mozjs128: used in various Mozilla products (including Firefox) and is available +mozjs128: under MPL/GPL/LGPL tri-license. +mozjs128: +mozjs128: Homepage: +mozjs128: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey +mozjs128: +mozjs128: +mozjs128: +mozjs128: diff --git a/source/l/mujs/mujs.SlackBuild b/source/l/mujs/mujs.SlackBuild new file mode 100755 index 000000000..6dd121c25 --- /dev/null +++ b/source/l/mujs/mujs.SlackBuild @@ -0,0 +1,105 @@ +#!/bin/bash + +# Copyright 2024 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. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=mujs +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + #SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + #SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + #SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + #SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + #SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + #SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$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 {} \+ + +make $NUMJOBS prefix=/usr libdir=/usr/lib${LIBDIRSUFFIX} || exit 1 +make install-shared prefix=/usr libdir=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG || exit 1 + +# 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 + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS* COPYING* README* \ + docs \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/mujs/mujs.url b/source/l/mujs/mujs.url new file mode 100644 index 000000000..c3fd3a812 --- /dev/null +++ b/source/l/mujs/mujs.url @@ -0,0 +1 @@ +https://mujs.com/downloads diff --git a/source/l/mujs/slack-desc b/source/l/mujs/slack-desc new file mode 100644 index 000000000..8d49d81e9 --- /dev/null +++ b/source/l/mujs/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 ':'. + + |-----handy-ruler------------------------------------------------------| +mujs: mujs (lightweight Javascript interpreter) +mujs: +mujs: MuJS is a lightweight Javascript interpreter designed for embedding in +mujs: other software to extend them with scripting capabilities. +mujs: +mujs: Homepage: https://mujs.com +mujs: +mujs: +mujs: +mujs: +mujs: diff --git a/source/l/ncurses/aaa_terminfo.SlackBuild b/source/l/ncurses/aaa_terminfo.SlackBuild index 44ac1fc13..e3588eb8f 100755 --- a/source/l/ncurses/aaa_terminfo.SlackBuild +++ b/source/l/ncurses/aaa_terminfo.SlackBuild @@ -102,4 +102,3 @@ cat $CWD/slack-desc.aaa_terminfo > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/l/ncurses/ncurses.SlackBuild b/source/l/ncurses/ncurses.SlackBuild index 8f561baaa..ae7e0e2e4 100755 --- a/source/l/ncurses/ncurses.SlackBuild +++ b/source/l/ncurses/ncurses.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2000-2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2000-2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -64,22 +64,32 @@ else LIBDIRSUFFIX="" fi -ncurses_configure() { +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf ncurses-$VERSION +tar xvf $CWD/ncurses-$VERSION.tar.?z || exit 1 +cd ncurses-$VERSION || exit 1 +chown -R root:root . + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ + --with-manpage-format=normal \ + --enable-widec \ --enable-colorfgbg \ --enable-hard-tabs \ --enable-overwrite \ --enable-xmc-glitch \ + --with-cxx-binding \ --with-cxx-shared \ - --with-ospeed=unsigned \ + --with-shared \ + --with-versioned-syms \ --with-termlib=tinfo \ --with-ticlib=tic \ - --with-gpm \ - --with-shared \ --without-debug \ --without-normal \ --without-profile \ @@ -87,46 +97,10 @@ CFLAGS="$SLKCFLAGS" \ --enable-pc-files \ --with-pkg-config-libdir=/usr/lib${LIBDIRSUFFIX}/pkgconfig \ --without-ada \ - $X86_64OPTS \ --program-suffix="" \ --program-prefix="" \ - $WIDEC \ - --build=$ARCH-slackware-linux -} + --build=$ARCH-slackware-linux || exit 1 -rm -rf $PKG -mkdir -p $TMP $PKG - -cd $TMP -rm -rf ncurses-$VERSION -tar xvf $CWD/ncurses-$VERSION.tar.?z || exit 1 -cd ncurses-$VERSION || exit 1 -chown -R root:root . - -## NOTE: nevermind trying this... patches have multiple failures. Use the -## dated archive from upstream instead. -# -### No rollup (*.patch.sh) patch available yet for ncurses-6.1, so we'll -### comment this out for now. -## Apply upstream patch collection: -#xzcat $CWD/ncurses-6.0-20160910-patch.sh.xz > ncurses-6.0-20160910-patch.sh -#sh ncurses-6.0-20160910-patch.sh -## Apply weekly ncurses patch updates: -#for file in $CWD/patches/*.patch.gz ; do -# zcat $file | patch -p1 --verbose || exit 1 -#done - -zcat $CWD/ncurses.mkhashsize.diff.gz | patch -p1 --verbose || exit 1 - -# Configure/build/install to package the standard ncurses libraries: -ncurses_configure || exit 1 -make $NUMJOBS || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Configure/build/install again with wide character support: -make clean -WIDEC=--enable-widec -ncurses_configure || exit 1 make $NUMJOBS || exit 1 make install DESTDIR=$PKG || exit 1 @@ -152,32 +126,38 @@ cp -a misc/termcap $PKG/etc/termcap find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -# Move the include files from /usr/include into /usr/include/ncurses, -# then make symlinks back into /usr/include. -( cd $PKG/usr/include - rm -rf ncurses - mkdir ncurses - mv *.h ncurses - for file in ncurses/* ; do - ln -sf $file . +# Move the ncurses libraries into /lib (for no reason basically, because we DO +# NOT officially support a separate /usr partition): +mkdir -p $PKG/lib${LIBDIRSUFFIX} +( cd $PKG/usr/lib${LIBDIRSUFFIX} + mv lib*.so.?.? lib*.so.? $PKG/lib${LIBDIRSUFFIX} + for file in *.so ; do + if [ -L $file ]; then + rm $file + ln -sf ../../lib${LIBDIRSUFFIX}/${file}.? $file + fi done ) -# Make an ncursesw symlink to /usr/include/ncurses: -if [ ! -d $PKG/usr/include/ncursesw -a ! -L $PKG/usr/include/ncursesw ]; then - ( cd $PKG/usr/include ; ln -sf ncurses ncursesw ) -fi +# Make sure anything requesting the non-wide libraries will be directed to +# the wide ones: +for library in form menu ncurses ncurses++ panel ; do + # Add a loader script: + echo "INPUT(-l${library}w)" > $PKG/usr/lib${LIBDIRSUFFIX}/lib${library}.so + # Make a pkg-config file symlink: + ln -sf ${library}w.pc $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/${library}.pc +done -# Move the ncurses libraries into /lib, since they're important: -mkdir -p $PKG/lib${LIBDIRSUFFIX} -( cd $PKG/usr/lib${LIBDIRSUFFIX} - chmod 755 *.so - chmod 644 *.a - mv libncurses.so.6* $PKG/lib${LIBDIRSUFFIX} - mv libncursesw.so.6* $PKG/lib${LIBDIRSUFFIX} - mv libtinfo.so.6* $PKG/lib${LIBDIRSUFFIX} - rm -f libtinfo.so.6 - ln -sf ../../lib${LIBDIRSUFFIX}/libtinfo.so.6 . +# Support the obsolete: +echo "INPUT(-ltinfo)" > $PKG/usr/lib${LIBDIRSUFFIX}/libtermcap.so + +# In case anything is linked to the non-wide ncurses libraries, make some +# compatibility symlinks: +( cd $PKG/lib${LIBDIRSUFFIX} + SONAME=$(echo libncursesw.so.? | rev | cut -f 1 -d .) + for library in form menu ncurses ncurses++ panel ; do + ln -sf lib${library}w.so.$SONAME lib${library}.so.$SONAME + done ) # Use linker loader scripts to make sure -tinfo dependency works: @@ -190,6 +170,9 @@ mkdir -p $PKG/lib${LIBDIRSUFFIX} echo "INPUT(-ltinfo)" > libtermcap.so ) +# NOTE 2024-04-29: I'm not sure these changes are still needed. +# Maybe GazL knows. +# # Use various upstream/fixed/better terminfo files to update the terminfo # database. Only *.terminfo files in $CWD/terminfo will be used. export TERMINFO=$PKG/usr/share/terminfo @@ -200,6 +183,13 @@ for tfile in $CWD/terminfo/*.terminfo ; do done unset TERMINFO +# Compress manual pages: +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 /usr/doc/ncurses-xxxxx with appropriate files: mkdir -p $PKG/usr/doc/ncurses-$VERSION cp -a \ @@ -209,6 +199,10 @@ mkdir -p $PKG/usr/doc/ncurses-$VERSION/c++ cp -a \ c++/NEWS c++/PROBLEMS c++/README-first \ $PKG/usr/doc/ncurses-$VERSION/c++ +mkdir -p $PKG/usr/doc/ncurses-$VERSION/html +cp -a \ + doc/html/*.html \ + $PKG/usr/doc/ncurses-$VERSION/html # We don't need the log of every change here, but we'll take some. # If you need the whole thing probably you already extracted the @@ -230,4 +224,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $TMP/ncurses-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz - diff --git a/source/l/ncurses/ncurses.mkhashsize.diff b/source/l/ncurses/ncurses.mkhashsize.diff deleted file mode 100644 index 035956da6..000000000 --- a/source/l/ncurses/ncurses.mkhashsize.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./include/MKhashsize.sh.orig 2019-04-22 14:07:41.451003244 -0500 -+++ ./include/MKhashsize.sh 2019-04-22 14:10:09.163003249 -0500 -@@ -35,7 +35,7 @@ - echo " */" - - test $# = 0 && set Caps --TABSIZE=`cat "$@" | grep -v '^[ #]' | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | grep -v "^userdef" | grep -v "^used_by" | wc -l` -+TABSIZE=$(cat "$@" | grep -v '^[ #]' | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | grep -v "^userdef" | grep -v "^used_by" | wc -l) - - echo "" - echo "#define CAPTABSIZE ${TABSIZE}" diff --git a/source/l/netpbm/netpbm.SlackBuild b/source/l/netpbm/netpbm.SlackBuild index 7004a028a..c93d2cd42 100755 --- a/source/l/netpbm/netpbm.SlackBuild +++ b/source/l/netpbm/netpbm.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -46,14 +46,11 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -88,6 +85,9 @@ zcat $CWD/netpbm-manfix.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/netpbm-manual-pages.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/netpbm-libdir-so.patch.gz | patch -p1 --verbose || exit 1 +# GCC 14 "fix": +cat $CWD/netpbm.gcc14.diff | patch -p1 --verbose || exit 1 + # Send blank lines to "configure" to just take defaults: ./configure << EOF diff --git a/source/l/netpbm/netpbm.gcc14.diff b/source/l/netpbm/netpbm.gcc14.diff new file mode 100644 index 000000000..ad1ee9f0b --- /dev/null +++ b/source/l/netpbm/netpbm.gcc14.diff @@ -0,0 +1,11 @@ +--- ./buildtools/configure.pl.orig 2024-04-12 12:11:55.000000000 -0500 ++++ ./buildtools/configure.pl 2024-05-10 19:05:04.538404953 -0500 +@@ -1537,7 +1537,7 @@ + " -pedantic -fno-common " . + "-Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit " . + "-Wwrite-strings -Wmissing-prototypes -Wundef " . +- "-Wno-unknown-pragmas "; ++ "-Wno-unknown-pragmas -Wno-error=incompatible-pointer-types "; + + if (wnostrictoverflowWorks($gccCommandName)) { + # The compiler generates some optimizations based on the assumption diff --git a/source/l/newt/newt.SlackBuild b/source/l/newt/newt.SlackBuild index bd9052c80..a2215a8c0 100755 --- a/source/l/newt/newt.SlackBuild +++ b/source/l/newt/newt.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=newt VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/nodejs/nodejs.SlackBuild b/source/l/nodejs/nodejs.SlackBuild index 8b35564a0..8da61997e 100755 --- a/source/l/nodejs/nodejs.SlackBuild +++ b/source/l/nodejs/nodejs.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2022, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Thanks to Audrius Kažukauskas, Ryan P.C. McQuen, and Willy Sudiarto Raharjo @@ -27,7 +27,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -45,21 +45,12 @@ fi NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -99,6 +90,7 @@ sed -i "s|'lib'|'lib${LIBDIRSUFFIX}'|g" deps/npm/lib/npm.js --shared-libuv \ --experimental-http-parser \ --shared-nghttp2 \ + --shared-nghttp3 \ --shared-cares \ --shared-brotli || exit 1 # --shared-v8 diff --git a/source/l/opencv/opencv.SlackBuild b/source/l/opencv/opencv.SlackBuild index fafc4ac92..5ed63db11 100755 --- a/source/l/opencv/opencv.SlackBuild +++ b/source/l/opencv/opencv.SlackBuild @@ -25,12 +25,12 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=opencv VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -48,21 +48,12 @@ fi NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -121,7 +112,6 @@ cd cmake-build -DWITH_OPENGL=ON \ -DWITH_OPENMP=ON \ -DWITH_QT=ON \ - -DWITH_XINE=ON \ -DOPENCV_ENABLE_NONFREE=ON \ -DOPENCV_EXTRA_MODULES_PATH=../${PKGNAM}_contrib-$VERSION/modules \ -DOPENCV_GENERATE_PKGCONFIG=ON \ diff --git a/source/l/orc/orc.SlackBuild b/source/l/orc/orc.SlackBuild index 8d2bd21eb..052e97e7f 100755 --- a/source/l/orc/orc.SlackBuild +++ b/source/l/orc/orc.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=orc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -35,7 +35,7 @@ PKG=$TMP/package-$PKGNAM # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -51,22 +51,14 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" SLKLDFLAGS="" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" SLKLDFLAGS="-L/usr/lib64" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - SLKLDFLAGS="" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" SLKLDFLAGS="" diff --git a/source/l/pango/pango.SlackBuild b/source/l/pango/pango.SlackBuild index b18eef80b..c083bee05 100755 --- a/source/l/pango/pango.SlackBuild +++ b/source/l/pango/pango.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2015, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2015, 2017, 2018, 2019, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -94,7 +94,7 @@ meson setup \ --sysconfdir=/etc \ --localstatedir=/var \ --buildtype=release \ - -Dgtk_doc=false \ + -Ddocumentation=false \ .. || exit 1 "${NINJA:=ninja}" $NUMJOBS || exit 1 DESTDIR=$PKG $NINJA install || exit 1 diff --git a/source/l/pangomm2/pangomm2.SlackBuild b/source/l/pangomm2/pangomm2.SlackBuild index 11fe16361..56e4bfb50 100755 --- a/source/l/pangomm2/pangomm2.SlackBuild +++ b/source/l/pangomm2/pangomm2.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -48,14 +48,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/pcre2/pcre2.url b/source/l/pcre2/pcre2.url index 9d3010efa..a65f97a53 100644 --- a/source/l/pcre2/pcre2.url +++ b/source/l/pcre2/pcre2.url @@ -1,2 +1,2 @@ https://github.com/PCRE2Project/pcre2 -https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.43/pcre2-10.43.tar.bz2 +https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.44/pcre2-10.44.tar.bz2 diff --git a/source/l/pilot-link/pilot-link-0.12.1-var.patch b/source/l/pilot-link/pilot-link-0.12.1-var.patch new file mode 100644 index 000000000..e1e6c6c5e --- /dev/null +++ b/source/l/pilot-link/pilot-link-0.12.1-var.patch @@ -0,0 +1,11 @@ +--- pilot-link-0.12.1/libpisock/dlp.c.pom 2006-08-27 18:20:17.000000000 +0200 ++++ pilot-link-0.12.1/libpisock/dlp.c 2006-11-30 13:39:29.000000000 +0100 +@@ -2268,7 +2268,7 @@ + if (errCode) { + LOG((PI_DBG_DLP, PI_DBG_LVL_INFO, + "DLP ReadFeature FtrGet error 0x%8.8lX\n", +- res)); ++ errCode)); + pi_set_palmos_error(sd, (int)errCode); + return pi_set_error(sd, PI_ERR_DLP_PALMOS); + } diff --git a/source/l/pilot-link/pilot-link-0.12.2-open.patch b/source/l/pilot-link/pilot-link-0.12.2-open.patch new file mode 100644 index 000000000..5766e66be --- /dev/null +++ b/source/l/pilot-link/pilot-link-0.12.2-open.patch @@ -0,0 +1,42 @@ +diff -up pilot-link-0.12.5/libpisock/serial.c.pom pilot-link-0.12.5/libpisock/serial.c +--- pilot-link-0.12.5/libpisock/serial.c.pom 2006-10-12 16:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/serial.c 2010-06-24 10:35:48.000000000 +0200 +@@ -286,7 +286,7 @@ pi_serial_connect(pi_socket_t *ps, struc + data->establishrate = data->rate = 57600; + } + +- if ((err = data->impl.open(ps, pa, addrlen)) < 0) ++ if ((err = (data->impl.open)(ps, pa, addrlen)) < 0) + return err; /* errno already set */ + + ps->raddr = malloc(addrlen); +@@ -362,7 +362,7 @@ pi_serial_bind(pi_socket_t *ps, struct s + } + + begin: +- if ((err = data->impl.open(ps, pa, addrlen)) < 0) { ++ if ((err = (data->impl.open)(ps, pa, addrlen)) < 0) { + int save_errno = errno; + #ifdef MAXPATHLEN + char realport[MAXPATHLEN]; +diff -up pilot-link-0.12.5/libpisock/usb.c.pom pilot-link-0.12.5/libpisock/usb.c +--- pilot-link-0.12.5/libpisock/usb.c.pom 2010-06-24 09:24:56.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/usb.c 2010-06-24 10:36:08.000000000 +0200 +@@ -267,7 +267,7 @@ pi_usb_connect(pi_socket_t *ps, struct s + data->establishrate = data->rate = 57600; + } + +- result = data->impl.open(ps, pa, addrlen); ++ result = (data->impl.open)(ps, pa, addrlen); + if (result < 0) + goto fail; + +@@ -343,7 +343,7 @@ pi_usb_bind(pi_socket_t *ps, struct sock + data->establishrate = data->rate = 57600; + } + +- result = data->impl.open(ps, pa, addrlen); ++ result = (data->impl.open)(ps, pa, addrlen); + if (result < 0) + return result; + diff --git a/source/l/pilot-link/pilot-link-0.12.3-clio.patch b/source/l/pilot-link/pilot-link-0.12.3-clio.patch new file mode 100644 index 000000000..a752c43d1 --- /dev/null +++ b/source/l/pilot-link/pilot-link-0.12.3-clio.patch @@ -0,0 +1,11 @@ +diff -up pilot-link-0.12.4/libpisock/usb.c.clio pilot-link-0.12.4/libpisock/usb.c +--- pilot-link-0.12.4/libpisock/usb.c.clio 2009-05-28 14:55:43.000000000 +0200 ++++ pilot-link-0.12.4/libpisock/usb.c 2009-05-28 14:56:57.000000000 +0200 +@@ -655,6 +655,7 @@ pi_usb_dev_t known_devices[] = { + .vendor = 0x054c, + .product = 0x0066, + .idstr = "Sony T, SJ series, and other Palm OS 4.0 devices", ++ .flags = USB_INIT_SONY_CLIE, + }, + + { diff --git a/source/l/pilot-link/pilot-link-0.12.5-aarch64.patch b/source/l/pilot-link/pilot-link-0.12.5-aarch64.patch new file mode 100644 index 000000000..97651e0b9 --- /dev/null +++ b/source/l/pilot-link/pilot-link-0.12.5-aarch64.patch @@ -0,0 +1,1348 @@ +diff -urN pilot-link-0.12.5/config.guess pilot-link-0.12.5-aarch64/config.guess +--- pilot-link-0.12.5/config.guess 2009-11-03 20:06:26.000000000 -0600 ++++ pilot-link-0.12.5-aarch64/config.guess 2013-03-08 06:00:41.342509645 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2009-06-10' ++timestamp='2012-09-25' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -17,9 +17,7 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see <http://www.gnu.org/licenses/>. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -27,16 +25,16 @@ + # the same distribution terms that you use for the rest of that program. + + +-# Originally written by Per Bothner <per@bothner.com>. +-# Please send patches to <config-patches@gnu.org>. Submit a context +-# diff and a properly formatted ChangeLog entry. ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to <config-patches@gnu.org> and include a ChangeLog ++# entry. + # + # This script attempts to guess a canonical system name similar to + # config.sub. If it succeeds, it prints the system name on stdout, and + # exits with 0. Otherwise, it exits with 1. + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -56,8 +54,9 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -144,7 +143,7 @@ + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -180,7 +179,7 @@ + fi + ;; + *) +- os=netbsd ++ os=netbsd + ;; + esac + # The OS release +@@ -201,6 +200,10 @@ + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} +@@ -223,7 +226,7 @@ + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on +@@ -269,7 +272,10 @@ + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit ;; ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead +@@ -295,12 +301,12 @@ + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) +- echo powerpc-ibm-os400 ++ echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; +- arm:riscos:*:*|arm:RISCOS:*:*) ++ arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +@@ -333,6 +339,9 @@ + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" +@@ -391,23 +400,23 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; +@@ -477,8 +486,8 @@ + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +@@ -491,7 +500,7 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; +@@ -548,7 +557,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -591,52 +600,52 @@ + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include <stdlib.h> ++ #include <unistd.h> ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); + +- #define _HPUX_SOURCE +- #include <stdlib.h> +- #include <unistd.h> +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa +@@ -727,22 +736,22 @@ + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; +@@ -766,14 +775,14 @@ + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +@@ -785,34 +794,39 @@ + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) +- case ${UNAME_MACHINE} in +- pc98) +- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + i*:windows32*:*) +- # uname -m includes "-pc" on this system. +- echo ${UNAME_MACHINE}-mingw32 ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; +- *:Interix*:[3456]*) +- case ${UNAME_MACHINE} in ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; +- EM64T | authenticamd | genuineintel) ++ authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) +@@ -854,6 +868,27 @@ + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ aarch64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ +@@ -861,20 +896,40 @@ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else +- echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ hexagon:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -901,39 +956,18 @@ + #endif + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +- echo or32-unknown-linux-gnu +- exit ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu +- exit ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu +- exit ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep -q ld.so.1 +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +@@ -942,14 +976,17 @@ + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -957,67 +994,18 @@ + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include <features.h> +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^LIBC/{ +- s: ::g +- p +- }'`" +- test x"${LIBC}" != x && { +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" +- exit +- } +- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } +- ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both +@@ -1025,11 +1013,11 @@ + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) +@@ -1061,7 +1049,7 @@ + fi + exit ;; + i*86:*:5:[678]*) +- # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; +@@ -1089,13 +1077,13 @@ + exit ;; + pc:*:*:*) + # Left here for compatibility: +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i586. ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp +- exit ;; ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; +@@ -1130,8 +1118,8 @@ + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4; exit; } ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ +@@ -1174,10 +1162,10 @@ + echo ns32k-sni-sysv + fi + exit ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says <Richard.M.Bartel@ccMail.Census.GOV> +- echo i586-unisys-sysv4 +- exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says <Richard.M.Bartel@ccMail.Census.GOV> ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes <hewes@openmarket.com>. + # How about differentiating between stratus architectures? -djm +@@ -1203,11 +1191,11 @@ + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; +@@ -1220,6 +1208,9 @@ + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +@@ -1247,6 +1238,16 @@ + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +@@ -1262,7 +1263,10 @@ + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; +- NSE-?:NONSTOP_KERNEL:*:*) ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) +@@ -1307,13 +1311,13 @@ + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} ++ echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) +- UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; +@@ -1331,11 +1335,11 @@ + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- + eval $set_cc_for_build + cat >$dummy.c <<EOF + #ifdef _SEQUENT_ +@@ -1353,11 +1357,11 @@ + #include <sys/param.h> + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" ++ "" + #endif +- ); exit (0); ++ ); exit (0); + #endif + #endif + +diff -urN pilot-link-0.12.5/config.sub pilot-link-0.12.5-aarch64/config.sub +--- pilot-link-0.12.5/config.sub 2009-11-03 20:06:26.000000000 -0600 ++++ pilot-link-0.12.5-aarch64/config.sub 2013-03-08 06:00:41.379505372 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2009-06-11' ++timestamp='2012-10-10' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -21,9 +21,7 @@ + # 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, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see <http://www.gnu.org/licenses/>. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -32,13 +30,16 @@ + + + # Please send patches to <config-patches@gnu.org>. Submit a context +-# diff and a properly formatted ChangeLog entry. ++# diff and a properly formatted GNU ChangeLog entry. + # + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. + # If it is invalid, we print an error message on stderr and exit with code 1. + # Otherwise, we print the canonical config type on stdout and succeed. + ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ + # This file is supposed to be the same for all GNU packages + # and recognize all the CPU types, system types and aliases + # that are meaningful with *any* GNU software. +@@ -72,8 +73,9 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -120,13 +122,18 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ +- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; ++ android-linux) ++ os=-linux-android ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ++ ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] +@@ -149,12 +156,12 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray) ++ -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; +- -bluegene*) +- os=-cnk ++ -bluegene*) ++ os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= +@@ -170,10 +177,10 @@ + os=-chorusos + basic_machine=$1 + ;; +- -chorusrdb) +- os=-chorusrdb ++ -chorusrdb) ++ os=-chorusrdb + basic_machine=$1 +- ;; ++ ;; + -hiux*) + os=-hiuxwe2 + ;; +@@ -218,6 +225,12 @@ + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -lynx*178) ++ os=-lynxos178 ++ ;; ++ -lynx*5) ++ os=-lynxos5 ++ ;; + -lynx*) + os=-lynxos + ;; +@@ -242,20 +255,25 @@ + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | be32 | be64 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ ++ | epiphany \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ +- | maxq | mb | microblaze | mcore | mep | metag \ ++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +@@ -278,27 +296,39 @@ + | moxie \ + | mt \ + | msp430 \ ++ | nds32 | nds32le | nds32be \ + | nios | nios2 \ + | ns16k | ns32k \ ++ | open8 \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ +- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ ++ | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ +- | spu | strongarm \ +- | tahoe | thumb | tic4x | tic80 | tron \ +- | v850 | v850e \ ++ | spu \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ ++ | ubicom32 \ ++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | we32k \ +- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12) +- # Motorola 68HC11/12. ++ c54x) ++ basic_machine=tic54x-unknown ++ ;; ++ c55x) ++ basic_machine=tic55x-unknown ++ ;; ++ c6x) ++ basic_machine=tic6x-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; +@@ -308,6 +338,21 @@ + basic_machine=mt-unknown + ;; + ++ strongarm | thumb | xscale) ++ basic_machine=arm-unknown ++ ;; ++ xgate) ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ xscaleeb) ++ basic_machine=armeb-unknown ++ ;; ++ ++ xscaleel) ++ basic_machine=armel-unknown ++ ;; ++ + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. +@@ -322,25 +367,30 @@ + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ ++ | be32-* | be64-* \ + | bfin-* | bs2000-* \ +- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +@@ -362,24 +412,29 @@ + | mmix-* \ + | mt-* \ + | msp430-* \ ++ | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ +- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ +- | romp-* | rs6000-* \ ++ | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ +- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ +- | tahoe-* | thumb-* \ +- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ ++ | tahoe-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile*-* \ + | tron-* \ +- | v850-* | v850e-* | vax-* \ ++ | ubicom32-* \ ++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ ++ | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) +@@ -404,7 +459,7 @@ + basic_machine=a29k-amd + os=-udi + ;; +- abacus) ++ abacus) + basic_machine=abacus-unknown + ;; + adobe68k) +@@ -474,11 +529,20 @@ + basic_machine=powerpc-ibm + os=-cnk + ;; ++ c54x-*) ++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c55x-*) ++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c6x-*) ++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; +- cegcc) ++ cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; +@@ -510,7 +574,7 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; +- cr16) ++ cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; +@@ -668,7 +732,6 @@ + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +-# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 +@@ -726,6 +789,13 @@ + basic_machine=ns32k-utek + os=-sysv + ;; ++ microblaze*) ++ basic_machine=microblaze-xilinx ++ ;; ++ mingw64) ++ basic_machine=x86_64-pc ++ os=-mingw64 ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 +@@ -762,10 +832,18 @@ + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; ++ msys) ++ basic_machine=i386-pc ++ os=-msys ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ++ nacl) ++ basic_machine=le32-unknown ++ os=-nacl ++ ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 +@@ -830,6 +908,12 @@ + np1) + basic_machine=np1-gould + ;; ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem ++ ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; +@@ -912,9 +996,10 @@ + ;; + power) basic_machine=power-ibm + ;; +- ppc) basic_machine=powerpc-unknown ++ ppc | ppcbe) basic_machine=powerpc-unknown + ;; +- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc-* | ppcbe-*) ++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown +@@ -1008,6 +1093,9 @@ + basic_machine=i860-stratus + os=-sysv4 + ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + sun2) + basic_machine=m68000-sun + ;; +@@ -1064,20 +1152,8 @@ + basic_machine=t90-cray + os=-unicos + ;; +- tic54x | c54x*) +- basic_machine=tic54x-unknown +- os=-coff +- ;; +- tic55x | c55x*) +- basic_machine=tic55x-unknown +- os=-coff +- ;; +- tic6x | c6x*) +- basic_machine=tic6x-unknown +- os=-coff +- ;; + tile*) +- basic_machine=tile-unknown ++ basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) +@@ -1147,6 +1223,9 @@ + xps | xps100) + basic_machine=xps100-honeywell + ;; ++ xscale-* | xscalee[bl]-*) ++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` ++ ;; + ymp) + basic_machine=ymp-cray + os=-unicos +@@ -1244,9 +1323,12 @@ + if [ x"$os" != x"" ] + then + case $os in +- # First match some system type aliases +- # that might get confused with valid system types. ++ # First match some system type aliases ++ # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; +@@ -1268,21 +1350,22 @@ + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ +- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ +- | -kopensolaris* \ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ +- | -openbsd* | -solidbsd* \ ++ | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ +@@ -1290,7 +1373,7 @@ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1329,7 +1412,7 @@ + -opened*) + os=-openedition + ;; +- -os400*) ++ -os400*) + os=-os400 + ;; + -wince*) +@@ -1378,7 +1461,7 @@ + -sinix*) + os=-sysv4 + ;; +- -tpf*) ++ -tpf*) + os=-tpf + ;; + -triton*) +@@ -1423,6 +1506,8 @@ + -dicos*) + os=-dicos + ;; ++ -nacl*) ++ ;; + -none) + ;; + *) +@@ -1445,10 +1530,10 @@ + # system, and we'll never get to this point. + + case $basic_machine in +- score-*) ++ score-*) + os=-elf + ;; +- spu-*) ++ spu-*) + os=-elf + ;; + *-acorn) +@@ -1460,8 +1545,20 @@ + arm*-semi) + os=-aout + ;; +- c4x-* | tic4x-*) +- os=-coff ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ hexagon-*) ++ os=-elf ++ ;; ++ tic54x-*) ++ os=-coff ++ ;; ++ tic55x-*) ++ os=-coff ++ ;; ++ tic6x-*) ++ os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) +@@ -1481,14 +1578,11 @@ + ;; + m68000-sun) + os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; +- mep-*) ++ mep-*) + os=-elf + ;; + mips*-cisco) +@@ -1515,7 +1609,7 @@ + *-ibm) + os=-aix + ;; +- *-knuth) ++ *-knuth) + os=-mmixware + ;; + *-wec) diff --git a/source/l/pilot-link/pilot-link-0.12.5-compiler_warnings.patch b/source/l/pilot-link/pilot-link-0.12.5-compiler_warnings.patch new file mode 100644 index 000000000..017a51c29 --- /dev/null +++ b/source/l/pilot-link/pilot-link-0.12.5-compiler_warnings.patch @@ -0,0 +1,3067 @@ +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/bindings/Perl/Pilot.xs pilot-link-0.12.5/bindings/Perl/Pilot.xs +--- pilot-link-0.12.5-old/bindings/Perl/Pilot.xs 2011-12-19 18:30:45.000000000 +0100 ++++ pilot-link-0.12.5/bindings/Perl/Pilot.xs 2011-12-19 17:51:55.364828217 +0100 +@@ -642,7 +642,7 @@ Unpack(record) + STRLEN len; + int i; + AV * e; +- HV * ret, *h; ++ HV * ret; + struct Appointment a; + char *str; + +@@ -740,7 +740,6 @@ Pack(record) + { + SV ** s; + HV * h; +- long advance; + struct Appointment a; + + if (!SvOK(record) || !SvRV(record) || (SvTYPE(h=(HV*)SvRV(record))!=SVt_PVHV)) +@@ -881,9 +880,7 @@ UnpackAppBlock(record) + CODE: + { + STRLEN len; +- AV * e; + HV * ret; +- int i; + struct AppointmentAppInfo a; + + if (SvOK(record) && SvRV(record) && (SvTYPE(SvRV(record)) == SVt_PVHV)) { +@@ -917,11 +914,9 @@ PackAppBlock(record) + SV * record + CODE: + { +- int i; + int len; + SV ** s; + HV * h; +- AV * av; + struct AppointmentAppInfo a; + + if (!SvRV(record) || (SvTYPE(h=(HV*)SvRV(record))!=SVt_PVHV)) +@@ -953,8 +948,6 @@ Unpack(record) + CODE: + { + STRLEN len; +- int i; +- AV * e; + HV * ret; + struct ToDo a; + char *str; +@@ -1049,9 +1042,7 @@ UnpackAppBlock(record) + CODE: + { + STRLEN len; +- AV * e; + HV * ret; +- int i; + struct ToDoAppInfo a; + + if (SvOK(record) && SvRV(record) && (SvTYPE(SvRV(record)) == SVt_PVHV)) { +@@ -1086,11 +1077,9 @@ PackAppBlock(record) + SV * record + CODE: + { +- int i; + int len; + SV ** s; + HV * h; +- AV * av; + struct ToDoAppInfo a; + + if (!SvRV(record) || (SvTYPE(h=(HV*)SvRV(record))!=SVt_PVHV)) +@@ -1342,8 +1331,6 @@ Unpack(record) + CODE: + { + STRLEN len; +- int i; +- AV * e; + HV * ret; + struct Memo a; + char *str; +@@ -1422,9 +1409,7 @@ UnpackAppBlock(record) + CODE: + { + STRLEN len; +- AV * e; + HV * ret; +- int i; + struct MemoAppInfo a; + + if (SvOK(record) && SvRV(record) && (SvTYPE(SvRV(record)) == SVt_PVHV)) { +@@ -1457,11 +1442,9 @@ PackAppBlock(record) + SV * record + CODE: + { +- int i; + int len; + SV ** s; + HV * h; +- AV * av; + struct MemoAppInfo a; + + if (!SvRV(record) || (SvTYPE(h=(HV*)SvRV(record))!=SVt_PVHV)) +@@ -1494,7 +1477,6 @@ Unpack(record) + CODE: + { + STRLEN len; +- int i; + HV * ret; + struct Expense e; + +@@ -1665,15 +1647,15 @@ PackAppBlock(record) + for(i=0;i<4;i++) { + HV * hv; + if ((s=av_fetch(av, i, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(hv=(HV*)SvRV(*s))==SVt_PVHV)) { +- if (s = hv_fetch(hv, "name", 4, 0)) { ++ if ((s = hv_fetch(hv, "name", 4, 0))) { + strncpy(e.currencies[i].name, SvPV(*s, PL_na), 16); + e.currencies[i].name[15] = 0; + } +- if (s = hv_fetch(hv, "symbol", 6, 0)) { ++ if ((s = hv_fetch(hv, "symbol", 6, 0))) { + strncpy(e.currencies[i].symbol, SvPV(*s, PL_na), 4); + e.currencies[i].symbol[3] = 0; + } +- if (s = hv_fetch(hv, "rate", 4, 0)) { ++ if ((s = hv_fetch(hv, "rate", 4, 0))) { + strncpy(e.currencies[i].rate, SvPV(*s, PL_na), 8); + e.currencies[i].rate[7] = 0; + } +@@ -1794,8 +1776,6 @@ Unpack(record) + CODE: + { + STRLEN len; +- int i; +- AV * e; + HV * ret; + struct Mail a; + +@@ -1897,9 +1877,7 @@ UnpackAppBlock(record) + CODE: + { + STRLEN len; +- AV * e; + HV * ret; +- int i; + struct MailAppInfo a; + + if (SvOK(record) && SvRV(record) && (SvTYPE(SvRV(record)) == SVt_PVHV)) { +@@ -1935,11 +1913,9 @@ PackAppBlock(record) + SV * record + CODE: + { +- int i; + int len; + SV ** s; + HV * h; +- AV * av; + struct MailAppInfo a; + + if (!SvRV(record) || (SvTYPE(h=(HV*)SvRV(record))!=SVt_PVHV)) +@@ -1973,9 +1949,7 @@ UnpackSyncPref(record) + CODE: + { + STRLEN len; +- AV * e; + HV * ret; +- int i; + struct MailSyncPref a; + + if (SvOK(record) && SvRV(record) && (SvTYPE(SvRV(record)) == SVt_PVHV)) { +@@ -2017,11 +1991,9 @@ PackSyncPref(record, id) + int id + CODE: + { +- int i; + int len; + SV ** s; + HV * h; +- AV * av; + struct MailSyncPref a; + + if (!SvRV(record) || (SvTYPE(h=(HV*)SvRV(record))!=SVt_PVHV)) +@@ -2057,9 +2029,7 @@ UnpackSignaturePref(record) + CODE: + { + STRLEN len; +- AV * e; + HV * ret; +- int i; + struct MailSignaturePref a; + + if (SvOK(record) && SvRV(record) && (SvTYPE(SvRV(record)) == SVt_PVHV)) { +@@ -2092,11 +2062,9 @@ PackSignaturePref(record, id) + int id + CODE: + { +- int i; + int len; + SV ** s; + HV * h; +- AV * av; + struct MailSignaturePref a; + + if (!SvRV(record) || (SvTYPE(h=(HV*)SvRV(record))!=SVt_PVHV)) +@@ -2599,7 +2567,6 @@ getRecordIDs(self, sort=0) + int start; + int count; + int i; +- AV * list = newAV(); + + start = 0; + for(;;) { +@@ -2784,7 +2751,6 @@ getPref(self, id=0, backup=1) + Char4 creator; + int version, result; + size_t len; +- SV * c, n, v; + int r; + if (self->Class) { + int count; +@@ -2846,7 +2812,7 @@ setPrefRaw(self, data, number, version, + { + STRLEN len; + Char4 creator; +- int version, result; ++ int result; + void * buf; + PackRaw; + buf = SvPV(data, len); +@@ -3063,8 +3029,6 @@ delete(self, name, cardno=0) + int cardno + CODE: + { +- UserInfo info; +- int result; + RETVAL = dlp_DeleteDB(self->socket, cardno, name); + } + OUTPUT: +@@ -3113,7 +3077,6 @@ open(self, name, mode=0, cardno=0) + self->errnop = result; + RETVAL = &PL_sv_undef; + } else { +- int type; + PDA__Pilot__DLP__DB * x = malloc(sizeof(PDA__Pilot__DLP__DB)); + SV * sv = newSViv((IV)(void*)x); + SvREFCNT_inc(ST(0)); +@@ -3205,7 +3168,6 @@ getPref(self, creator, id=0, backup=1) + { + int version, result; + size_t len; +- SV * c, n, v; + result = dlp_ReadAppPreference(self->socket, creator, id, backup, 0xFFFF, mybuf, &len, &version); + ReturnReadPref(mybuf, len); + } +@@ -3245,7 +3207,7 @@ setPrefRaw(self, data, creator, number, + PPCODE: + { + STRLEN len; +- int version, result; ++ int result; + void * buf; + PackRaw; + buf = SvPV(data, len); +@@ -3323,8 +3285,6 @@ getDBInfo(self, start, RAM=1, ROM=0, car + int cardno + CODE: + { +- struct DBInfo info; +- + int where = (RAM ? dlpDBListRAM : 0) | (ROM ? dlpDBListROM : 0); + int result = dlp_ReadDBList(self->socket, cardno, where, start, &pibuf); + pack_dbinfo(RETVAL,(*(struct DBInfo *)(pibuf.data)), result); +@@ -3388,7 +3348,6 @@ getROMToken(self,token) + PPCODE: + { + char buffer[50]; +- long long_token; + size_t size; + int result; + +@@ -3592,7 +3551,7 @@ getRecords(self) + PDA::Pilot::File *self + CODE: + { +- int len, result = 0; ++ int len; + pi_file_get_entries(self->pf, &len); + RETVAL = newSViv((int)len); + } +@@ -3715,7 +3674,6 @@ addResource(self, data, type, id) + CODE: + { + STRLEN len; +- int result; + void * buf; + PackResource; + buf = SvPV(data, len); +@@ -3733,7 +3691,6 @@ addRecord(self, data) + STRLEN len; + unsigned long id; + int attr, category; +- int result; + void * buf; + PackRecord; + buf = SvPV(data, len); +@@ -3752,7 +3709,6 @@ addRecordRaw(self, data, uid, attr, cate + CODE: + { + STRLEN len; +- int result; + void * buf; + PackRaw; + buf = SvPV(data, len); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/include/pi-debug.h pilot-link-0.12.5/include/pi-debug.h +--- pilot-link-0.12.5-old/include/pi-debug.h 2008-11-06 11:45:33.000000000 +0100 ++++ pilot-link-0.12.5/include/pi-debug.h 2011-12-12 16:04:53.892605487 +0100 +@@ -57,10 +57,10 @@ extern void pi_debug_set_file PI_ARGS((c + extern void pi_log PI_ARGS((int type, int level, PI_CONST char *format, ...)); + + extern void pi_dumpline +- PI_ARGS((PI_CONST char *buf, size_t len, unsigned int addr)); ++ PI_ARGS((PI_CONST unsigned char *buf, size_t len, unsigned int addr)); + + extern void pi_dumpdata +- PI_ARGS((PI_CONST char *buf, size_t len)); ++ PI_ARGS((PI_CONST unsigned char *buf, size_t len)); + + #ifdef PI_DEBUG + #define ASSERT(expr) \ +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/include/pi-header.h pilot-link-0.12.5/include/pi-header.h +--- pilot-link-0.12.5-old/include/pi-header.h 2006-10-17 15:24:07.000000000 +0200 ++++ pilot-link-0.12.5/include/pi-header.h 2011-12-19 16:44:54.555489570 +0100 +@@ -25,7 +25,7 @@ + + #ifndef SWIG + /* Print the version splash */ +-void print_splash(const char *progname) PI_DEPRECATED; ++void print_splash(const char *progname); + + /* Connect to the Palm device */ + int pilot_connect(const char *port) PI_DEPRECATED; +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/include/pi-md5.h pilot-link-0.12.5/include/pi-md5.h +--- pilot-link-0.12.5-old/include/pi-md5.h 2010-02-07 04:42:37.000000000 +0100 ++++ pilot-link-0.12.5/include/pi-md5.h 2011-12-14 17:40:52.551602121 +0100 +@@ -23,7 +23,7 @@ + #if HAVE_STDINT_H + #include <stdint.h> + #endif +-#ifdef HAVE_INTTYPES_H || HAVE_STDINT_H ++#if defined(HAVE_INTTYPES_H) || defined(HAVE_STDINT_H) + #define UINT8 uint8_t + #define UINT32 uint32_t + #else +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/include/pi-md5.h.in pilot-link-0.12.5/include/pi-md5.h.in +--- pilot-link-0.12.5-old/include/pi-md5.h.in 2010-02-07 04:42:49.000000000 +0100 ++++ pilot-link-0.12.5/include/pi-md5.h.in 2011-12-20 16:40:09.826454843 +0100 +@@ -22,7 +22,7 @@ + #if HAVE_STDINT_H + #include <stdint.h> + #endif +-#ifdef HAVE_INTTYPES_H || HAVE_STDINT_H ++#if defined(HAVE_INTTYPES_H) || defined(HAVE_STDINT_H) + #define UINT8 uint8_t + #define UINT32 uint32_t + #else +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/include/pi-source.h pilot-link-0.12.5/include/pi-source.h +--- pilot-link-0.12.5-old/include/pi-source.h 2006-10-17 15:24:07.000000000 +0200 ++++ pilot-link-0.12.5/include/pi-source.h 2011-12-14 13:03:26.571720585 +0100 +@@ -145,10 +145,10 @@ extern "C" { + pi_dumpline() and pi_dumpdata() */ + + extern void dumpline +- PI_ARGS((PI_CONST char *buf, size_t len, unsigned int addr)) PI_DEPRECATED; ++ PI_ARGS((PI_CONST unsigned char *buf, size_t len, unsigned int addr)) PI_DEPRECATED; + + extern void dumpdata +- PI_ARGS((PI_CONST char *buf, size_t len)) PI_DEPRECATED; ++ PI_ARGS((PI_CONST unsigned char *buf, size_t len)) PI_DEPRECATED; + + + #ifdef __cplusplus +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/include/pi-util.h pilot-link-0.12.5/include/pi-util.h +--- pilot-link-0.12.5-old/include/pi-util.h 2006-10-17 15:24:07.000000000 +0200 ++++ pilot-link-0.12.5/include/pi-util.h 2011-12-07 21:25:14.513131657 +0100 +@@ -64,19 +64,19 @@ extern "C" { + PI_ARGS((int *establishrate, int *establishhighrate)); + + extern int convert_ToPilotChar_WithCharset +- PI_ARGS((const char *charset, const char *text, int bytes, ++ PI_ARGS((const char *charset, char *text, int bytes, + char **ptext, const char *pi_charset)); + + extern int convert_ToPilotChar +- PI_ARGS((const char *charset, const char *text, int bytes, ++ PI_ARGS((const char *charset, char *text, int bytes, + char **ptext)); + + extern int convert_FromPilotChar_WithCharset +- PI_ARGS((const char *charset, const char *ptext, int bytes, ++ PI_ARGS((const char *charset, char *ptext, int bytes, + char **text, const char *pi_charset)); + + extern int convert_FromPilotChar +- PI_ARGS((const char *charset, const char *ptext, int bytes, ++ PI_ARGS((const char *charset, char *ptext, int bytes, + char **text)); + + /** @brief Convert a milliseconds timeout value to an absolute timespec +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/address.c pilot-link-0.12.5/libpisock/address.c +--- pilot-link-0.12.5-old/libpisock/address.c 2007-01-15 01:29:59.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/address.c 2011-12-07 20:24:45.951236249 +0100 +@@ -209,7 +209,7 @@ unpack_AddressAppInfo(AddressAppInfo_t * + size_t i, + destlen = 4 + 16 * 22 + 2 + 2; + +- unsigned char *start = record; ++ const unsigned char *start = record; + unsigned long r; + + ai->type = address_v1; +@@ -276,11 +276,6 @@ pack_AddressAppInfo(const AddressAppInfo + pos += i; + len -= i; + +- for (i = 3; i < 8; i++) +- strcpy(ai->phoneLabels[i - 3], ai->labels[i]); +- for (i = 19; i < 22; i++) +- strcpy(ai->phoneLabels[i - 19 + 5], ai->labels[i]); +- + memset(pos, 0, destlen); + + r = 0; +@@ -297,11 +292,6 @@ pack_AddressAppInfo(const AddressAppInfo + set_byte(pos, ai->sortByCompany); + pos += 2; + +- for (i = 3; i < 8; i++) +- strcpy(ai->phoneLabels[i - 3], ai->labels[i]); +- for (i = 19; i < 22; i++) +- strcpy(ai->phoneLabels[i - 19 + 5], ai->labels[i]); +- + return (pos - record); + } + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/bluetooth.c pilot-link-0.12.5/libpisock/bluetooth.c +--- pilot-link-0.12.5-old/libpisock/bluetooth.c 2008-05-03 22:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/bluetooth.c 2012-01-04 19:54:41.494267929 +0100 +@@ -286,14 +286,11 @@ static pi_protocol_t* + pi_bluetooth_protocol (pi_device_t *dev) + { + pi_protocol_t *prot; +- struct pi_bluetooth_data *data; + + ASSERT (dev != NULL); + + prot = (pi_protocol_t *) malloc(sizeof (pi_protocol_t)); + +- data = (struct pi_bluetooth_data *)(dev->data); +- + if (prot != NULL) { + prot->level = PI_LEVEL_DEV; + prot->dup = pi_bluetooth_protocol_dup; +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/calendar.c pilot-link-0.12.5/libpisock/calendar.c +--- pilot-link-0.12.5-old/libpisock/calendar.c 2010-02-07 03:21:18.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/calendar.c 2012-01-13 16:07:09.096320373 +0100 +@@ -461,7 +461,7 @@ unpack_CalendarEvent(CalendarEvent_t *a, + } + } + if(p2 - buf->data < buf->used) { +- printf("Extra data found %ld bytes\n", (buf->used - (p2 - buf->data))); ++ printf("Extra data found %zu bytes\n", (buf->used - (p2 - buf->data))); + return -1; + } + } else { +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/darwinusb.c pilot-link-0.12.5/libpisock/darwinusb.c +--- pilot-link-0.12.5-old/libpisock/darwinusb.c 2007-01-15 01:29:59.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/darwinusb.c 2011-12-13 16:25:22.825510660 +0100 +@@ -1096,7 +1096,7 @@ find_interfaces(usb_connection_t *c, + { + /* got something! */ + LOG((PI_DBG_DEV, PI_DBG_LVL_DEBUG, "darwinusb: got %d bytes there!\n", (int)size)); +- CHECK(PI_DBG_DEV, PI_DBG_LVL_DEBUG, pi_dumpdata(c->read_buffer, size)); ++ CHECK(PI_DBG_DEV, PI_DBG_LVL_DEBUG, pi_dumpdata((unsigned char *)c->read_buffer, size)); + if (!memcmp(c->read_buffer, "VNDR10", 6)) + { + /* VNDR version 1.0 */ +@@ -1235,7 +1235,7 @@ read_visor_connection_information (IOUSB + } + else + { +- CHECK(PI_DBG_DEV, PI_DBG_LVL_DEBUG, pi_dumpdata((const char *)&ci, sizeof(ci))); ++ CHECK(PI_DBG_DEV, PI_DBG_LVL_DEBUG, pi_dumpdata((unsigned char *)&ci, sizeof(ci))); + ci.num_ports = CFSwapInt16LittleToHost(ci.num_ports); /* number of ports is little-endian */ + if (ci.num_ports > 8) + ci.num_ports = 8; +@@ -1280,7 +1280,7 @@ decode_generic_connection_information(pa + { + int i; + +- CHECK(PI_DBG_DEV, PI_DBG_LVL_DEBUG, pi_dumpdata((const char *)ci, sizeof(palm_ext_connection_info))); ++ CHECK(PI_DBG_DEV, PI_DBG_LVL_DEBUG, pi_dumpdata((unsigned char *)ci, sizeof(palm_ext_connection_info))); + LOG((PI_DBG_DEV, PI_DBG_LVL_DEBUG, "darwinusb: decode_generic_connection_information num_ports=%d, endpoint_numbers_different=%d\n", ci->num_ports, ci->endpoint_numbers_different)); + + for (i=0; i < ci->num_ports; i++) +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/debug.c pilot-link-0.12.5/libpisock/debug.c +--- pilot-link-0.12.5-old/libpisock/debug.c 2006-10-12 16:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/debug.c 2011-12-14 13:03:16.364897382 +0100 +@@ -173,7 +173,7 @@ pi_log (int type, int level, const char + } + + void +-pi_dumpline(const char *buf, size_t len, unsigned int addr) ++pi_dumpline(const unsigned char *buf, size_t len, unsigned int addr) + { + unsigned int i; + int offset; +@@ -212,14 +212,14 @@ pi_dumpline(const char *buf, size_t len, + } + + void +-dumpline(const char *buf, size_t len, unsigned int addr) ++dumpline(const unsigned char *buf, size_t len, unsigned int addr) + { + /* this function will be removed in 0.13. Use pi_dumpline() instead. */ + pi_dumpline(buf, len, addr); + } + + void +-pi_dumpdata(const char *buf, size_t len) ++pi_dumpdata(const unsigned char *buf, size_t len) + { + unsigned int i; + +@@ -228,7 +228,7 @@ pi_dumpdata(const char *buf, size_t len) + } + + void +-dumpdata(const char *buf, size_t len) ++dumpdata(const unsigned char *buf, size_t len) + { + /* this function will be removed in 0.13. Use pi_dumpdata() instead */ + pi_dumpdata(buf, len); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/dlp.c pilot-link-0.12.5/libpisock/dlp.c +--- pilot-link-0.12.5-old/libpisock/dlp.c 2011-12-19 18:30:44.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/dlp.c 2011-12-13 18:12:50.807265809 +0100 +@@ -173,7 +173,7 @@ static void record_dump (unsigned long r + (flags & dlpRecAttrArchived) ? " Archive" : "", + (!flags) ? " None" : "", + flags, data_len)); +- pi_dumpdata(data, (size_t)data_len); ++ pi_dumpdata((unsigned char *)data, (size_t)data_len); + } + #endif + +@@ -1663,7 +1663,7 @@ dlp_CallApplication(int sd, unsigned lon + get_long(DLP_RESPONSE_DATA(res, 0, 0)), + data_len)); + CHECK(PI_DBG_DLP, PI_DBG_LVL_DEBUG, +- pi_dumpdata(DLP_RESPONSE_DATA(res, 0, 16), ++ pi_dumpdata((unsigned char *)DLP_RESPONSE_DATA(res, 0, 16), + (size_t)data_len)); + } + +@@ -1711,7 +1711,7 @@ dlp_CallApplication(int sd, unsigned lon + (unsigned int)get_short(DLP_RESPONSE_DATA(res, 0, 2)), + data_len)); + CHECK(PI_DBG_DLP, PI_DBG_LVL_DEBUG, +- pi_dumpdata(DLP_RESPONSE_DATA(res, 0, 6), ++ pi_dumpdata((unsigned char *)DLP_RESPONSE_DATA(res, 0, 6), + (size_t)data_len)); + } + } +@@ -2497,7 +2497,7 @@ dlp_ReadRecordIDList(int sd, int dbhandl + LOG((PI_DBG_DLP, PI_DBG_LVL_INFO, + "DLP ReadRecordIDList %d IDs:\n", ret)); + CHECK(PI_DBG_DLP, PI_DBG_LVL_DEBUG, +- pi_dumpdata(DLP_RESPONSE_DATA(res, 0, 2), ++ pi_dumpdata((unsigned char *)DLP_RESPONSE_DATA(res, 0, 2), + (size_t)(ret * 4))); + } + +@@ -2731,7 +2731,7 @@ dlp_ReadResourceByType(int sd, int dbhan + printlong(type), resID, + get_short(DLP_RESPONSE_DATA(res, 0, 6)),(size_t)data_len)); + CHECK(PI_DBG_DLP, PI_DBG_LVL_DEBUG, +- pi_dumpdata(DLP_RESPONSE_DATA(res, 0, 10),(size_t)data_len)); ++ pi_dumpdata((unsigned char *)DLP_RESPONSE_DATA(res, 0, 10),(size_t)data_len)); + } else { + data_len = result; + } +@@ -2830,7 +2830,7 @@ dlp_ReadResourceByIndex(int sd, int dbha + get_short(DLP_RESPONSE_DATA(res, 0, 4)), + resindex, data_len)); + CHECK(PI_DBG_DLP, PI_DBG_LVL_DEBUG, +- pi_dumpdata(DLP_RESPONSE_DATA(res, 0, (large ? 12 : 10)), ++ pi_dumpdata((unsigned char *)DLP_RESPONSE_DATA(res, 0, (large ? 12 : 10)), + (size_t)data_len)); + } else { + data_len = result; +@@ -2961,7 +2961,7 @@ dlp_ReadAppBlock(int sd, int dbhandle, i + LOG((PI_DBG_DLP, PI_DBG_LVL_INFO, + "DLP ReadAppBlock %d bytes\n", data_len)); + CHECK(PI_DBG_DLP, PI_DBG_LVL_DEBUG, +- pi_dumpdata(DLP_RESPONSE_DATA(res, 0, 2), ++ pi_dumpdata((unsigned char *)DLP_RESPONSE_DATA(res, 0, 2), + (size_t)data_len)); + } + } else { +@@ -3048,7 +3048,7 @@ dlp_ReadSortBlock(int sd, int dbhandle, + LOG((PI_DBG_DLP, PI_DBG_LVL_INFO, + "DLP ReadSortBlock %d bytes\n", data_len)); + CHECK(PI_DBG_DLP, PI_DBG_LVL_DEBUG, +- pi_dumpdata(DLP_RESPONSE_DATA(res, 0, 2), ++ pi_dumpdata((unsigned char *)DLP_RESPONSE_DATA(res, 0, 2), + (size_t)data_len)); + } + } else { +@@ -3254,7 +3254,7 @@ dlp_ReadNextRecInCategory(int sd, int db + (!flags) ? " None" : "", + flags, data_len)); + CHECK(PI_DBG_DLP, PI_DBG_LVL_DEBUG, +- pi_dumpdata(DLP_RESPONSE_DATA(res, 0, 10), ++ pi_dumpdata((unsigned char *)DLP_RESPONSE_DATA(res, 0, 10), + (size_t)data_len)); + } else { + data_len = result; +@@ -3362,7 +3362,7 @@ dlp_ReadAppPreference(int sd, unsigned l + get_short(DLP_RESPONSE_DATA(res, 0, 2)), + get_short(DLP_RESPONSE_DATA(res, 0, 4)))); + CHECK(PI_DBG_DLP, PI_DBG_LVL_DEBUG, +- pi_dumpdata(DLP_RESPONSE_DATA(res, 0, 6), ++ pi_dumpdata((unsigned char *)DLP_RESPONSE_DATA(res, 0, 6), + (size_t)data_len)); + } else { + data_len = result; +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/hinote.c pilot-link-0.12.5/libpisock/hinote.c +--- pilot-link-0.12.5-old/libpisock/hinote.c 2006-10-12 16:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/hinote.c 2012-01-04 20:01:27.297338187 +0100 +@@ -121,8 +121,7 @@ pack_HiNoteNote(HiNoteNote_t *hinote, un + int + unpack_HiNoteAppInfo(HiNoteAppInfo_t *appinfo, unsigned char *record, size_t len) + { +- int i, +- idx; ++ int i; + unsigned char *start; + + start = record; +@@ -133,7 +132,7 @@ unpack_HiNoteAppInfo(HiNoteAppInfo_t *ap + len -= i; + if (len < 48) + return 0; +- for (idx = 0; i < 48; i++) ++ for (i = 0; i < 48; i++) + appinfo->reserved[i] = *record++; + return (record - start); + } +@@ -153,8 +152,7 @@ unpack_HiNoteAppInfo(HiNoteAppInfo_t *ap + int + pack_HiNoteAppInfo(HiNoteAppInfo_t *appinfo, unsigned char *record, size_t len) + { +- int i, +- idx; ++ int i; + unsigned char *start = record; + + i = pack_CategoryAppInfo(&appinfo->category, record, len); +@@ -166,7 +164,7 @@ pack_HiNoteAppInfo(HiNoteAppInfo_t *appi + len -= i; + if (len < 48) + return (record - start); +- for (idx = 0; i < 48; i++) ++ for (i = 0; i < 48; i++) + *record++ = appinfo->reserved[i]; + + return (record - start); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/inet.c pilot-link-0.12.5/libpisock/inet.c +--- pilot-link-0.12.5-old/libpisock/inet.c 2006-10-12 16:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/inet.c 2012-01-04 19:11:50.256766421 +0100 +@@ -112,12 +112,9 @@ static pi_protocol_t* + pi_inet_protocol (pi_device_t *dev) + { + pi_protocol_t *prot; +- pi_inet_data_t *data; + + ASSERT (dev != NULL); + +- data = dev->data; +- + prot = (pi_protocol_t *)malloc (sizeof (pi_protocol_t)); + + if (prot != NULL) { +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/libusb.c pilot-link-0.12.5/libpisock/libusb.c +--- pilot-link-0.12.5-old/libpisock/libusb.c 2007-02-09 17:06:22.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/libusb.c 2012-01-04 19:57:15.495647341 +0100 +@@ -468,7 +468,7 @@ u_write(struct pi_socket *ps, const unsi + if (len <= 0) + return 0; + +- ret = usb_bulk_write (USB_handle, USB_out_endpoint, buf, len, timeout); ++ ret = usb_bulk_write (USB_handle, USB_out_endpoint, (char *)buf, len, timeout); + LOG((PI_DBG_DEV, PI_DBG_LVL_DEBUG, "Wrote: %d.\n", ret)); + if (ret > 0) + CHECK (PI_DBG_DEV, PI_DBG_LVL_DEBUG, pi_dumpdata (buf, ret)); +@@ -505,7 +505,6 @@ u_read_i(struct pi_socket *ps, pi_buffer + if (RD_buffer_used < len) { + struct timeval now; + struct timespec when, nownow; +- int last_used; + gettimeofday(&now, NULL); + when.tv_sec = now.tv_sec + timeout / 1000; + when.tv_nsec = (now.tv_usec + (timeout % 1000) * 1000) * 1000; +@@ -516,8 +515,6 @@ u_read_i(struct pi_socket *ps, pi_buffer + + RD_wanted = len; + do { +- last_used = RD_buffer_used; +- + LOG((PI_DBG_DEV, PI_DBG_LVL_DEBUG, "%s %d (%s): %d %d.\n", + __FILE__, __LINE__, __FUNCTION__, len, RD_buffer_used)); + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/linuxusb.c pilot-link-0.12.5/libpisock/linuxusb.c +--- pilot-link-0.12.5-old/libpisock/linuxusb.c 2006-10-12 16:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/linuxusb.c 2011-12-07 16:52:23.942559596 +0100 +@@ -27,6 +27,7 @@ + #include <stdio.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <sys/socket.h> + + #include "pi-debug.h" + #include "pi-source.h" +@@ -48,8 +49,8 @@ + + static int u_open(pi_socket_t *ps, struct pi_sockaddr *addr, size_t addrlen); + static int u_close(pi_socket_t *ps); +-static int u_write(pi_socket_t *ps, unsigned char *buf, size_t len, int flags); +-static int u_read(pi_socket_t *ps, pi_buffer_t *buf, size_t len, int flags); ++static ssize_t u_write(pi_socket_t *ps, const unsigned char *buf, size_t len, int flags); ++static ssize_t u_read(pi_socket_t *ps, pi_buffer_t *buf, size_t len, int flags); + static int u_poll(pi_socket_t *ps, int timeout); + static int u_flush(pi_socket_t *ps, int flags); + +@@ -188,8 +189,8 @@ u_poll(pi_socket_t *ps, int timeout) + * Returns: Nothing + * + ***********************************************************************/ +-static int +-u_write(pi_socket_t *ps, unsigned char *buf, size_t len, int flags) ++static ssize_t ++u_write(pi_socket_t *ps, const unsigned char *buf, size_t len, int flags) + { + int total, + nwrote; +@@ -281,7 +282,7 @@ u_read_buf (pi_socket_t *ps, pi_buffer_t + * Returns: number of bytes read or negative otherwise + * + ***********************************************************************/ +-static int ++static ssize_t + u_read(pi_socket_t *ps, pi_buffer_t *buf, size_t len, int flags) + { + ssize_t rbuf = 0, +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/Makefile.am pilot-link-0.12.5/libpisock/Makefile.am +--- pilot-link-0.12.5-old/libpisock/Makefile.am 2009-05-25 05:22:55.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/Makefile.am 2011-12-19 13:22:17.375486115 +0100 +@@ -1,5 +1,4 @@ + INCLUDES = \ +- -I../include \ + -I$(top_srcdir)/include + + bluetooth_FILES = \ +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/Makefile.in pilot-link-0.12.5/libpisock/Makefile.in +--- pilot-link-0.12.5-old/libpisock/Makefile.in 2012-01-04 17:53:04.413603881 +0100 ++++ pilot-link-0.12.5/libpisock/Makefile.in 2012-01-04 22:52:56.453905685 +0100 +@@ -317,7 +317,6 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + usb_libs = @usb_libs@ + INCLUDES = \ +- -I../include \ + -I$(top_srcdir)/include + + bluetooth_FILES = \ +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/memo.c pilot-link-0.12.5/libpisock/memo.c +--- pilot-link-0.12.5-old/libpisock/memo.c 2007-01-15 01:30:00.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/memo.c 2011-12-07 20:35:30.203369247 +0100 +@@ -122,7 +122,7 @@ unpack_MemoAppInfo(struct MemoAppInfo *a + size_t len) + { + int i = unpack_CategoryAppInfo(&appinfo->category, record, len); +- unsigned char *start = record; ++ const unsigned char *start = record; + + appinfo->type = memo_v1; + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/net.c pilot-link-0.12.5/libpisock/net.c +--- pilot-link-0.12.5-old/libpisock/net.c 2006-10-12 16:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/net.c 2011-12-13 18:18:46.987142736 +0100 +@@ -382,7 +382,7 @@ net_tx(pi_socket_t *ps, const unsigned c + } + + CHECK(PI_DBG_NET, PI_DBG_LVL_INFO, net_dump_header(buf, 1, ps->sd)); +- CHECK(PI_DBG_NET, PI_DBG_LVL_DEBUG, pi_dumpdata((char *)msg, len)); ++ CHECK(PI_DBG_NET, PI_DBG_LVL_DEBUG, pi_dumpdata(msg, len)); + + free(buf); + return len; +@@ -513,7 +513,7 @@ net_rx(pi_socket_t *ps, pi_buffer_t *msg + LOG ((PI_DBG_NET, PI_DBG_LVL_ERR, + "NET RX (%i): Unknown packet type\n", + ps->sd)); +- CHECK(PI_DBG_NET, PI_DBG_LVL_INFO, pi_dumpdata((char *)header->data, PI_NET_HEADER_LEN)); ++ CHECK(PI_DBG_NET, PI_DBG_LVL_INFO, pi_dumpdata(header->data, PI_NET_HEADER_LEN)); + pi_buffer_free(header); + return pi_set_error(ps->sd, PI_ERR_PROT_BADPACKET); + } +@@ -704,7 +704,7 @@ net_dump(unsigned char *header, unsigned + size_t size; + + size = get_long(&header[PI_NET_OFFSET_SIZE]); +- pi_dumpdata((char *)data, size); ++ pi_dumpdata(data, size); + } + + /* vi: set ts=8 sw=4 sts=4 noexpandtab: cin */ +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/padp.c pilot-link-0.12.5/libpisock/padp.c +--- pilot-link-0.12.5-old/libpisock/padp.c 2007-02-16 17:25:43.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/padp.c 2011-12-12 16:18:02.112726207 +0100 +@@ -959,7 +959,7 @@ padp_dump(const unsigned char *data) + if (size > PI_PADP_MTU) + size = PI_PADP_MTU; + if (type != padAck) +- pi_dumpdata((char *)&data[header_size], size); ++ pi_dumpdata(&data[header_size], size); + } + + /* vi: set ts=8 sw=4 sts=4 noexpandtab: cin */ +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/palmpix.c pilot-link-0.12.5/libpisock/palmpix.c +--- pilot-link-0.12.5-old/libpisock/palmpix.c 2006-10-12 16:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/palmpix.c 2012-01-04 19:26:38.628945553 +0100 +@@ -1609,22 +1609,24 @@ static int + int + unpack_PalmPixHeader (struct PalmPixHeader *h, const unsigned char *p, int len) + { +- int magic1, magic2; ++ /* int magic1, magic2; */ + + if (len != 196) + return 0; + ++ /* + magic1 = p[1]; + magic2 = get_le_short (&p[46]); +- ++ */ ++ + /* FIXME For now, don't check the magic. I've seen 0x0002 and 0x0201. + I'm not sure that the endianness is right on this one. Possibly it + should be interpreted as two bytes instead (major and minor?). */ +- #if 0 ++ /* + if (magic1 != 0 || (magic2 != 0x0102 && magic2 != 0x0002)) + return 0; +- #endif +- ++ */ ++ + h->numRec= p[0]; + h->month= p[2]; + h->day= p[3]; +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/pi-file.c pilot-link-0.12.5/libpisock/pi-file.c +--- pilot-link-0.12.5-old/libpisock/pi-file.c 2006-10-12 16:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/pi-file.c 2011-12-21 16:00:10.858944394 +0100 +@@ -382,7 +382,7 @@ pi_file_read_resource_by_type_id(pi_file + int resid, void **bufp, size_t *sizep, + int *resindex) + { +- int i, ++ int i = 0, + result; + + result = pi_file_find_resource_by_type_id(pf, restype, resid, &i); +@@ -1351,7 +1351,9 @@ pi_file_close_for_write(pi_file_t *pf) + } + + /* This may just be packing */ +- fwrite("\0\0", 1, 2, f); ++ if (fwrite("\0\0", 1, 2, f) != 2) { ++ goto bad; ++ } + + if (pf->app_info + && (fwrite(pf->app_info, 1,(size_t) pf->app_info_size, f) != +@@ -1364,7 +1366,9 @@ pi_file_close_for_write(pi_file_t *pf) + goto bad; + + +- fwrite(pf->tmpbuf->data, pf->tmpbuf->used, 1, f); ++ if (fwrite(pf->tmpbuf->data, pf->tmpbuf->used, 1, f) != 1) { ++ goto bad; ++ } + fflush(f); + + if (ferror(f) || feof(f)) +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/serial.c pilot-link-0.12.5/libpisock/serial.c +--- pilot-link-0.12.5-old/libpisock/serial.c 2011-12-19 18:30:44.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/serial.c 2011-12-20 17:38:49.101508096 +0100 +@@ -374,7 +374,9 @@ begin: + # endif /* PATH_MAX */ + #endif /* MAXPATHLEN */ + +- realpath(pa->pi_device, realport); ++ if (!realpath(pa->pi_device, realport)) { ++ strncpy(realport, pa->pi_device, sizeof(pa->pi_device)); ++ } + errno = save_errno; + + if (errno == ENOENT) { +@@ -482,7 +484,7 @@ pi_serial_accept(pi_socket_t *ps, struct + LOG((PI_DBG_DEV, PI_DBG_LVL_DEBUG, "%s: %d, poll result: %d.\n", __FILE__, __LINE__, result)); + + if (result < 0) { +- char buf[] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 }; ++ unsigned char buf[] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 }; + data->impl.write(ps, buf, sizeof (buf), 1000); + } + } +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/slp.c pilot-link-0.12.5/libpisock/slp.c +--- pilot-link-0.12.5-old/libpisock/slp.c 2006-10-17 15:19:53.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/slp.c 2011-12-12 16:18:40.700958799 +0100 +@@ -362,7 +362,7 @@ slp_rx(pi_socket_t *ps, pi_buffer_t *buf + } else { + LOG((PI_DBG_SLP, PI_DBG_LVL_WARN, + "SLP RX Header checksum failed for header:\n")); +- pi_dumpdata((const char *)slp_buf->data, PI_SLP_HEADER_LEN); ++ pi_dumpdata(slp_buf->data, PI_SLP_HEADER_LEN); + pi_buffer_free (slp_buf); + return 0; + } +@@ -646,7 +646,7 @@ slp_dump_header(const unsigned char *dat + void + slp_dump(const unsigned char *data) + { +- pi_dumpdata((char *)&data[PI_SLP_HEADER_LEN], get_short(&data[PI_SLP_OFFSET_SIZE])); ++ pi_dumpdata(&data[PI_SLP_HEADER_LEN], get_short(&data[PI_SLP_OFFSET_SIZE])); + } + + /* vi: set ts=8 sw=4 sts=4 noexpandtab: cin */ +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/socket.c pilot-link-0.12.5/libpisock/socket.c +--- pilot-link-0.12.5-old/libpisock/socket.c 2007-01-15 01:30:00.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/socket.c 2012-01-12 19:43:34.935489417 +0100 +@@ -1106,7 +1106,9 @@ pi_listen(int pi_sd, int backlog) + { + pi_socket_t *ps; + +- if (!(ps = find_pi_socket(pi_sd))) { ++ ps = find_pi_socket(pi_sd); ++ ++ if (!ps || !ps->device) { + errno = ESRCH; + return PI_ERR_SOCK_INVALID; + } +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/sys.c pilot-link-0.12.5/libpisock/sys.c +--- pilot-link-0.12.5-old/libpisock/sys.c 2006-10-12 16:21:22.000000000 +0200 ++++ pilot-link-0.12.5/libpisock/sys.c 2012-01-04 19:27:23.408239457 +0100 +@@ -241,14 +241,12 @@ sys_rx(pi_socket_t *ps, pi_buffer_t *buf + pi_protocol_t *next, + *prot; + +- pi_sys_data_t *data; + size_t data_len; + + prot = pi_protocol(ps->sd, PI_LEVEL_SYS); + if (prot == NULL) + return pi_set_error(ps->sd, PI_ERR_SOCK_INVALID); + +- data = (pi_sys_data_t *)prot->data; + next = pi_protocol_next(ps->sd, PI_LEVEL_SYS); + if (next == NULL) + return pi_set_error(ps->sd, PI_ERR_SOCK_INVALID); +@@ -360,7 +358,7 @@ sys_dump_header(const unsigned char *dat + void + sys_dump(const unsigned char *data, size_t len) + { +- pi_dumpdata((char *)&data[PI_SYS_HEADER_LEN], len); ++ pi_dumpdata(&data[PI_SYS_HEADER_LEN], len); + } + + /* vi: set ts=8 sw=4 sts=4 noexpandtab: cin */ +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisock/todo.c pilot-link-0.12.5/libpisock/todo.c +--- pilot-link-0.12.5-old/libpisock/todo.c 2007-01-15 01:30:00.000000000 +0100 ++++ pilot-link-0.12.5/libpisock/todo.c 2011-12-07 20:47:25.134224235 +0100 +@@ -232,7 +232,7 @@ int + unpack_ToDoAppInfo(ToDoAppInfo_t *appinfo, const unsigned char *record, size_t len) + { + int i; +- unsigned char *start = record; ++ const unsigned char *start = record; + + appinfo->type = todo_v1; + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisync/Makefile.am pilot-link-0.12.5/libpisync/Makefile.am +--- pilot-link-0.12.5-old/libpisync/Makefile.am 2005-02-17 20:01:35.000000000 +0100 ++++ pilot-link-0.12.5/libpisync/Makefile.am 2011-12-19 13:22:30.210258195 +0100 +@@ -1,5 +1,4 @@ + INCLUDES = \ +- -I../include \ + -I$(top_srcdir)/include \ + $(ICONV_CFLAGS) + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisync/Makefile.in pilot-link-0.12.5/libpisync/Makefile.in +--- pilot-link-0.12.5-old/libpisync/Makefile.in 2012-01-04 17:53:04.463602027 +0100 ++++ pilot-link-0.12.5/libpisync/Makefile.in 2012-01-04 22:52:56.503897733 +0100 +@@ -284,7 +284,6 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + usb_libs = @usb_libs@ + INCLUDES = \ +- -I../include \ + -I$(top_srcdir)/include \ + $(ICONV_CFLAGS) + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisync/sync.c pilot-link-0.12.5/libpisync/sync.c +--- pilot-link-0.12.5-old/libpisync/sync.c 2006-08-06 17:55:57.000000000 +0200 ++++ pilot-link-0.12.5/libpisync/sync.c 2011-12-07 21:09:46.536334579 +0100 +@@ -330,7 +330,7 @@ static int open_db(SyncHandler * sh, int + { + if (sh->secret) + return dlp_OpenDB(sh->sd, 0, dlpOpenReadWrite +- && dlpOpenSecret, sh->name, dbhandle); ++ | dlpOpenSecret, sh->name, dbhandle); + else + return dlp_OpenDB(sh->sd, 0, dlpOpenReadWrite, sh->name, + dbhandle); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/libpisync/util.c pilot-link-0.12.5/libpisync/util.c +--- pilot-link-0.12.5-old/libpisync/util.c 2006-08-25 14:33:25.000000000 +0200 ++++ pilot-link-0.12.5/libpisync/util.c 2011-12-07 21:25:04.906262096 +0100 +@@ -60,7 +60,7 @@ + * + ***********************************************************************/ + int +-convert_ToPilotChar(const char *charset, const char *text, ++convert_ToPilotChar(const char *charset, char *text, + int bytes, char **ptext) + { + #ifdef HAVE_ICONV +@@ -100,7 +100,7 @@ convert_ToPilotChar(const char *charset, + * + ***********************************************************************/ + int +-convert_ToPilotChar_WithCharset(const char *charset, const char *text, ++convert_ToPilotChar_WithCharset(const char *charset, char *text, + int bytes, char **ptext, const char * pi_charset) + { + #ifdef HAVE_ICONV +@@ -155,7 +155,7 @@ convert_ToPilotChar_WithCharset(const ch + * + ***********************************************************************/ + int +-convert_FromPilotChar(const char *charset, const char *ptext, ++convert_FromPilotChar(const char *charset, char *ptext, + int bytes, char **text) + { + #ifdef HAVE_ICONV +@@ -191,7 +191,7 @@ convert_FromPilotChar(const char *charse + * + ***********************************************************************/ + int +-convert_FromPilotChar_WithCharset(const char *charset, const char *ptext, ++convert_FromPilotChar_WithCharset(const char *charset, char *ptext, + int bytes, char **text, const char * pi_charset) + { + #ifdef HAVE_ICONV +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/popt/popt.c pilot-link-0.12.5/popt/popt.c +--- pilot-link-0.12.5-old/popt/popt.c 2004-08-27 18:27:48.000000000 +0200 ++++ pilot-link-0.12.5/popt/popt.c 2012-01-04 19:47:06.517804911 +0100 +@@ -367,7 +367,6 @@ static int execCommand(poptContext con) + poptItem item = con->doExec; + const char ** argv; + int argc = 0; +- int rc; + + if (item == NULL) /*XXX can't happen*/ + return POPT_ERROR_NOARG; +@@ -411,8 +410,7 @@ static int execCommand(poptContext con) + argv[argc] = NULL; + + #ifdef __hpux +- rc = setresuid(getuid(), getuid(),-1); +- if (rc) return POPT_ERROR_ERRNO; ++ if (setresuid(getuid(), getuid(),-1)) return POPT_ERROR_ERRNO; + #else + /* + * XXX " ... on BSD systems setuid() should be preferred over setreuid()" +@@ -420,11 +418,10 @@ static int execCommand(poptContext con) + * XXX from Norbert Warmuth <nwarmuth@privat.circular.de> + */ + #if defined(HAVE_SETUID) +- rc = setuid(getuid()); +- if (rc) return POPT_ERROR_ERRNO; ++ if (setuid(getuid())) return POPT_ERROR_ERRNO; + #elif defined (HAVE_SETREUID) +- rc = setreuid(getuid(), getuid()); /*hlauer: not portable to hpux9.01 */ +- if (rc) return POPT_ERROR_ERRNO; ++ /*hlauer: not portable to hpux9.01 */ ++ if (setreuid(getuid(), getuid())) return POPT_ERROR_ERRNO; + #else + ; /* Can't drop privileges */ + #endif +@@ -443,7 +440,7 @@ if (_popt_debug) + } + #endif + +- rc = execvp(argv[0], (char *const *)argv); ++ execvp(argv[0], (char *const *)argv); + + return POPT_ERROR_ERRNO; + } +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/Makefile.am pilot-link-0.12.5/src/Makefile.am +--- pilot-link-0.12.5-old/src/Makefile.am 2007-11-12 15:52:14.000000000 +0100 ++++ pilot-link-0.12.5/src/Makefile.am 2011-12-16 17:42:55.878155194 +0100 +@@ -72,6 +72,8 @@ libpiuserland_la_SOURCES = \ + userland.c + libpiuserland_la_LDFLAGS = \ + -static ++libpiuserland_la_LIBADD = \ ++ $(POPT_LIBS) + + #getrom_SOURCES = \ + # getrom.c +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/Makefile.in pilot-link-0.12.5/src/Makefile.in +--- pilot-link-0.12.5-old/src/Makefile.in 2012-01-04 17:53:04.645595287 +0100 ++++ pilot-link-0.12.5/src/Makefile.in 2012-01-04 22:52:56.694867357 +0100 +@@ -87,7 +87,9 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) +-libpiuserland_la_LIBADD = ++am__DEPENDENCIES_1 = ++@ENABLE_CONDUITS_TRUE@libpiuserland_la_DEPENDENCIES = \ ++@ENABLE_CONDUITS_TRUE@ $(am__DEPENDENCIES_1) + am__libpiuserland_la_SOURCES_DIST = plu_args.c userland.c + @ENABLE_CONDUITS_TRUE@am_libpiuserland_la_OBJECTS = plu_args.lo \ + @ENABLE_CONDUITS_TRUE@ userland.lo +@@ -102,7 +104,6 @@ am__pilot_addresses_SOURCES_DIST = pilot + @ENABLE_CONDUITS_TRUE@am_pilot_addresses_OBJECTS = \ + @ENABLE_CONDUITS_TRUE@ pilot-addresses.$(OBJEXT) + pilot_addresses_OBJECTS = $(am_pilot_addresses_OBJECTS) +-am__DEPENDENCIES_1 = + @ENABLE_CONDUITS_TRUE@pilot_addresses_DEPENDENCIES = libpiuserland.la \ + @ENABLE_CONDUITS_TRUE@ $(am__DEPENDENCIES_1) \ + @ENABLE_CONDUITS_TRUE@ $(top_builddir)/libpisock/libpisock.la +@@ -689,6 +690,9 @@ SUBDIRS = prc pix + @ENABLE_CONDUITS_TRUE@libpiuserland_la_LDFLAGS = \ + @ENABLE_CONDUITS_TRUE@ -static + ++@ENABLE_CONDUITS_TRUE@libpiuserland_la_LIBADD = \ ++@ENABLE_CONDUITS_TRUE@ $(POPT_LIBS) ++ + + #getrom_SOURCES = \ + # getrom.c +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-addresses.c pilot-link-0.12.5/src/pilot-addresses.c +--- pilot-link-0.12.5-old/src/pilot-addresses.c 2009-06-04 15:32:30.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-addresses.c 2011-12-21 16:08:30.778052438 +0100 +@@ -613,7 +613,8 @@ int main(int argc, const char *argv[]) { + int c, /* switch */ + db, + l, +- sd = -1; ++ sd = -1, ++ old_quiet = 0; + + enum { mode_none, mode_read, mode_write, mode_delete_all, mode_delete } + run_mode = mode_none; +@@ -744,7 +745,7 @@ int main(int argc, const char *argv[]) { + " tool. The data format of the AddressBook has changed. The legacy format\n" + " is called \"Classic\" and PalmOS 5.x and later uses \"Extended\" databases\n" + " with a different structure. Your Palm has \"Contacts\", and this tool reads\n" +- " the \"AddressBook\" database. (Found OS version: %x)\n\n" ++ " the \"AddressBook\" database. (Found OS version: %lu)\n\n" + + " Due to this change, pilot-addresses and other tools must be rewritten to\n" + " compensate. Sorry about the inconvenience.\n\n", info.romVersion); +@@ -775,7 +776,6 @@ int main(int argc, const char *argv[]) { + switch(run_mode) { + FILE *f; + int i; +- int old_quiet; + case mode_none: + /* impossible */ + fprintf(stderr,"%s",mode_error); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-clip.c pilot-link-0.12.5/src/pilot-clip.c +--- pilot-link-0.12.5-old/src/pilot-clip.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-clip.c 2011-12-20 17:46:26.422661747 +0100 +@@ -189,7 +189,9 @@ int main(int argc, const char *argv[]) + if (b == NULL) + goto error_close; + if (ret > 0) +- write(fileno(stdout), b, ret); ++ if (write(fileno(stdout), b, ret) < 0) { ++ goto error_close; ++ } + } + + if (pi_close(sd) < 0) +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-csd.c pilot-link-0.12.5/src/pilot-csd.c +--- pilot-link-0.12.5-old/src/pilot-csd.c 2009-06-04 15:32:31.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-csd.c 2011-12-19 14:45:25.245377872 +0100 +@@ -383,7 +383,7 @@ int main(int argc, const char *argv[]) + + if ((get_byte(mesg + 2) == 0x01) && (n > 12)) { + struct in_addr ip, mask; +- char *name = mesg + 12; ++ char *name = (char *)mesg + 12; + + memcpy(&ip, mesg + 4, 4); + memcpy(&mask, mesg + 8, 4); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-debug.c pilot-link-0.12.5/src/pilot-debug.c +--- pilot-link-0.12.5-old/src/pilot-debug.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-debug.c 2011-12-13 18:20:08.241744455 +0100 +@@ -253,7 +253,7 @@ Read_Pilot(ClientData clientData, int ma + return; + + /* puts("From Palm:"); +- pi_dumpdata((unsigned char *)buf, l); */ ++ pi_dumpdata(buf, l); */ + + if (buf[2] == 0) { /* SysPkt command */ + if (buf[0] == 2) { /* UI */ +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-dlpsh.c pilot-link-0.12.5/src/pilot-dlpsh.c +--- pilot-link-0.12.5-old/src/pilot-dlpsh.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-dlpsh.c 2012-01-04 20:04:15.478831743 +0100 +@@ -378,7 +378,6 @@ int rm_fn(int sd, int argc, const char * + ***********************************************************************/ + int time_fn(int sd, int argc, const char *argv[]) + { +- int s; + time_t ltime; + struct tm *tm_ptr; + struct timeval tv; +@@ -389,11 +388,11 @@ int time_fn(int sd, int argc, const char + + strftime(timebuf, 80, "Now setting Palm time from desktop to: " + "%a %b %d %H:%M:%S %Z %Y\n", tm_ptr); +- printf(timebuf); ++ printf("%s", timebuf); + gettimeofday(&tv, 0); + ltime = tv.tv_sec + 1; + usleep(1000000 - tv.tv_usec); +- s = dlp_SetSysDateTime(sd, ltime); ++ dlp_SetSysDateTime(sd, ltime); + + return 0; + } +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-file.c pilot-link-0.12.5/src/pilot-file.c +--- pilot-link-0.12.5-old/src/pilot-file.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-file.c 2011-12-20 18:05:28.584045279 +0100 +@@ -243,9 +243,12 @@ static void list_records(struct pi_file + sprintf(name, "%4s%04x.bin", + printlong(type), id_); + fp = fopen(name, "w"); +- fwrite(buf, size, 1, fp); ++ if (fwrite(buf, size, 1, fp) == 1) { ++ printf("(written to %s)\n", name); ++ } else { ++ printf("(failed to write to %s)\n", name); ++ } + fclose(fp); +- printf("(written to %s)\n", name); + } + } + } +@@ -326,9 +329,12 @@ static void dump_record(struct pi_file * + + sprintf(name, "%4s%04x.bin", printlong(type), id_); + fp = fopen(name, "w"); +- fwrite(buf, size, 1, fp); ++ if (fwrite(buf, size, 1, fp) == 1) { ++ printf("(written to %s)\n", name); ++ } else { ++ printf("(failed to write to %s)\n", name); ++ } + fclose(fp); +- printf("(written to %s)\n", name); + } + } else { + printf("entries\n"); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-foto.c pilot-link-0.12.5/src/pilot-foto.c +--- pilot-link-0.12.5-old/src/pilot-foto.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-foto.c 2011-12-20 18:49:18.859925180 +0100 +@@ -85,9 +85,15 @@ int get_jpg_info(FILE * in, char *type, + rewind(in); + + /* marker identifier, application use marker */ +- fread(&word, 2, 1, in); ++ if (fread(&word, 2, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + word1 = htons(word); +- fread(&word, 2, 1, in); ++ if (fread(&word, 2, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + word2 = htons(word); + /* printf("start of image 0x%02x 0x%02x\n", str[0], str[1]); */ + /* printf("application use marker 0x%02x 0x%02x\n", str[2], str[3]); */ +@@ -101,7 +107,10 @@ int get_jpg_info(FILE * in, char *type, + + *height = *width = -1; + /* length of application block */ +- fread(&word, 2, 1, in); ++ if (fread(&word, 2, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + len = htons(word); + /* printf("len %d\n", len); */ + if (len > 65535) { +@@ -110,7 +119,10 @@ int get_jpg_info(FILE * in, char *type, + return -1; + } + +- fread(str, 5, 1, in); ++ if (fread(str, 5, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + str[6] = '\0'; + /* printf("%s\n", str); */ + if (strncmp(str, "JFIF", 4) && strncmp(str, "Exif", 4) +@@ -123,18 +135,27 @@ int get_jpg_info(FILE * in, char *type, + type[4] = '\0'; + + /* Version */ +- fread(&word, 2, 1, in); ++ if (fread(&word, 2, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + *version = htons(word); + /* printf("version %d.%02d\n", ((*version)&0xFF00)>>8, (*version)&0xFF); */ + +- fread(str, len - 9, 1, in); ++ if (fread(str, len - 9, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + /* Units 1 byte + * X and Y density, 1 byte each + * X and Y thumbnail size, 2 bytes each + */ + while (!feof(in)) { + /* marker identifier */ +- fread(&word, 2, 1, in); ++ if (fread(&word, 2, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + word1 = htons(word); + m1 = (word1 & 0xFF00) >> 8; + m2 = word1 & 0xFF; +@@ -143,18 +164,30 @@ int get_jpg_info(FILE * in, char *type, + if ((m1 == 0xFF) && (m2 == 0xC0)) { + /* The SOF0 marker (Start of Frame 0) */ + /* length(2 bytes) and data precision(1 byte) */ +- fread(str, 3, 1, in); ++ if (fread(str, 3, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + /* Height */ +- fread(&word, 2, 1, in); ++ if (fread(&word, 2, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + *height = htons(word); + /* printf("height %d\n", *height); */ + /* Width */ +- fread(&word, 2, 1, in); ++ if (fread(&word, 2, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + *width = htons(word); + /* printf("width %d\n", *width); */ + break; + } +- fread(&word, 2, 1, in); ++ if (fread(&word, 2, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + len = htons(word); + /* printf("len %d\n", len); */ + if (len > 65535) { +@@ -162,7 +195,10 @@ int get_jpg_info(FILE * in, char *type, + rewind(in); + return -1; + } +- fread(str, len - 2, 1, in); ++ if (fread(str, len - 2, 1, in) != 1) { ++ rewind(in); ++ return -1; ++ } + } + + rewind(in); +@@ -432,7 +468,9 @@ int do_fetch(int sd, const char **fetch_ + &attr, &category); + index++; + if (ret > 0 && buffer->used > 8) +- fwrite(buffer->data + 8, buffer->used - 8, 1, out); ++ if (fwrite(buffer->data + 8, buffer->used - 8, 1, out) != 1) { ++ fprintf(stderr, "Failed, unable to write data.\n"); ++ } + } while (ret > 0); + + dlp_CloseDB(sd, db); +@@ -691,7 +729,7 @@ int pdb_to_jpg(const char *filename) + int ret; + void *Pbuf; + size_t size; +- int total_size; ++ int total_size, actual_size; + int attr; + int cat; + recordid_t uid; +@@ -712,19 +750,24 @@ int pdb_to_jpg(const char *filename) + + index = 0; + total_size = 0; ++ actual_size = 0; + ret = 1; + while (ret >= 0) { + ret = pi_file_read_record(pi_fp, index, &Pbuf, &size, &attr, + &cat, &uid); + index++; + if ((ret >= 0) && (size > 8)) { +- fwrite(((char *) Pbuf) + 8, size - 8, 1, out); +- total_size += size - 8; ++ total_size += size - 8; ++ if (fwrite(((char *) Pbuf) + 8, size - 8, 1, out) != 1) { ++ printf("FAILED: could not write data.\n"); ++ continue; ++ } ++ actual_size += size - 8; + } + } + fclose(out); + +- printf("OK, wrote %d bytes to %s\n", total_size, info.name); ++ printf("OK, wrote %d of %d bytes to %s\n", actual_size, total_size, info.name); + return 0; + } + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-foto-treo600.c pilot-link-0.12.5/src/pilot-foto-treo600.c +--- pilot-link-0.12.5-old/src/pilot-foto-treo600.c 2009-06-04 15:32:30.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-foto-treo600.c 2011-12-20 20:26:16.865031433 +0100 +@@ -82,12 +82,15 @@ int extract_image(struct pi_file *pi_fp, + if (pi_file_read_record + (pi_fp, i, &Pbuf, &size, &attr, &cat, &uid) < 0) { + fprintf(stderr," WARNING: Error reading image record %d\n\n", i); ++ close(fd); + return -1; + } + + if (req_uid && uid == req_uid) { + memcpy(&req_uid, Pbuf, 4); /* get next req_uid for image 'block' */ +- write(fd, Pbuf + 4, size - 4); /* The rest is just jpeg data */ ++ if (write(fd, Pbuf + 4, size - 4) < 0) { /* The rest is just jpeg data */ ++ fprintf(stderr," WARNING: Error writing image data to %s\n", imgfilename); ++ } + } + } + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-foto-treo650.c pilot-link-0.12.5/src/pilot-foto-treo650.c +--- pilot-link-0.12.5-old/src/pilot-foto-treo650.c 2009-06-04 15:32:30.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-foto-treo650.c 2012-01-04 22:12:18.456346583 +0100 +@@ -41,13 +41,11 @@ + static int + pi_file_retrieve_VFS(const int fd, const int socket, FileRef file, const char *rpath ) + { +- int rpathlen = vfsMAXFILENAME; +- long attributes; +- pi_buffer_t *buffer; +- ssize_t readsize,writesize; +- int filesize; +- int original_filesize; +- int written_so_far; ++ unsigned long attributes; ++ pi_buffer_t *buffer; ++ ssize_t readsize,writesize; ++ int filesize; ++ int written_so_far; + pi_progress_t progress; + + enum +@@ -60,8 +58,6 @@ static int + internal_=-6 + }; + +- rpathlen=strlen(rpath); +- + if (dlp_VFSFileGetAttributes(socket,file,&attributes) < 0) + { + fprintf(stderr," Could not get attributes of VFS file.\n"); +@@ -78,7 +74,6 @@ static int + } + + dlp_VFSFileSize(socket,file,&filesize); +- original_filesize = filesize; + + memset(&progress, 0, sizeof(progress)); + progress.type = PI_PROGRESS_RECEIVE_VFS; +@@ -226,7 +221,7 @@ static void + } + else + { +- if( index = rindex( infos[i].name, '.' )) ++ if(( index = rindex( infos[i].name, '.' ))) + { + // printf( "index: %s %d strlen %d\n", infos[i].name, index, strlen( infos[i].name ) ); + if(( index + 4 ) == (infos[i].name + strlen( infos[i].name ))) +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-getrom.c pilot-link-0.12.5/src/pilot-getrom.c +--- pilot-link-0.12.5-old/src/pilot-getrom.c 2009-06-04 15:32:31.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-getrom.c 2011-12-20 18:56:35.349427789 +0100 +@@ -176,7 +176,10 @@ int do_get_rom(int sd,const char *filena + if (j == len) + lseek(file, len, SEEK_CUR); + else +- write(file, buffer, len); ++ if (write(file, buffer, len) < 0) { ++ printf("\n Failed to write to file!\n"); ++ goto cancel; ++ } + offset += len; + if (cancel || !(i++ % 8)) + if (cancel || (dlp_OpenConduit(sd) < 0)) { +@@ -272,7 +275,7 @@ int do_get_ram(int sd, const char *filen + PackRPC(&p, 0xA026, RPC_IntReply, RPC_Ptr(print, 8), + RPC_Long(penPtr), RPC_Long(8), RPC_End); + /* err = */ dlp_RPC(sd, &p, 0); +- pi_dumpdata(print, 8); ++ pi_dumpdata((unsigned char *)print, 8); + #endif + + signal(SIGINT, sighandler); +@@ -304,7 +307,10 @@ int do_get_ram(int sd, const char *filen + if (j == len) + lseek(file, len, SEEK_CUR); + else +- write(file, buffer, len); ++ if (write(file, buffer, len) < 0) { ++ printf("\n Failed to write to file!\n"); ++ goto cancel; ++ } + + offset += len; + if (cancel || !(i++ % 4)) +@@ -414,27 +420,31 @@ int main(int argc, const char *argv[]) + const char *opthelp = NULL; + + /* These are optimized away compile-time */ +- if (DEFAULT_MODE == mode_getrom) { +- progname = "pilot-getrom"; +- opthelp= +- "[filename]\n\n" +- " Retrieves the ROM image from your Palm device.\n\n"; +- } else if (DEFAULT_MODE == mode_gettoken) { +- progname="pilot-getromtoken"; +- opthelp= +- "\n\n" +- " Reads a ROM token from a Palm Handheld device.\n" +- " Tokens you may currently extract are:\n" +- " adcc: Entropy for internal A->D convertor calibration\n" +- " irda: Present only on memory card w/IrDA support\n" +- " snum: Device serial number (from Memory Card Flash ID)\n\n" +- " Example arguments:\n" +- " -p /dev/pilot -t snum\n\n"; +- } else if (DEFAULT_MODE == mode_getram) { +- progname="pilot-getram"; +- opthelp= +- "[filename]\n\n" +- " Retrieves the RAM image from your Palm device\n\n"; ++ switch (DEFAULT_MODE) { ++ case mode_getrom: ++ progname = "pilot-getrom"; ++ opthelp= ++ "[filename]\n\n" ++ " Retrieves the ROM image from your Palm device.\n\n"; ++ break; ++ case mode_gettoken: ++ progname="pilot-getromtoken"; ++ opthelp= ++ "\n\n" ++ " Reads a ROM token from a Palm Handheld device.\n" ++ " Tokens you may currently extract are:\n" ++ " adcc: Entropy for internal A->D convertor calibration\n" ++ " irda: Present only on memory card w/IrDA support\n" ++ " snum: Device serial number (from Memory Card Flash ID)\n\n" ++ " Example arguments:\n" ++ " -p /dev/pilot -t snum\n\n"; ++ break; ++ case mode_getram: ++ progname="pilot-getram"; ++ opthelp= ++ "[filename]\n\n" ++ " Retrieves the RAM image from your Palm device\n\n"; ++ break; + } + + if (!progname) { +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-hinotes.c pilot-link-0.12.5/src/pilot-hinotes.c +--- pilot-link-0.12.5-old/src/pilot-hinotes.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-hinotes.c 2012-01-04 20:08:29.926499751 +0100 +@@ -51,13 +51,11 @@ void write_memo_mbox(struct PilotUser Us + + time_t ltime; + struct tm *tm_ptr; +- char c, +- fromtmbuf[80], +- recvtmbuf[80]; ++ char fromtmbuf[80], ++ recvtmbuf[80]; + + time(<ime); + tm_ptr = localtime(<ime); +- c = *asctime(tm_ptr); + + strftime(fromtmbuf, 80, "%a, %d %b %H:%M:%S %Y (%Z)\n", tm_ptr); + strftime(recvtmbuf, 80, "%d %b %H:%M:%S %Y\n", tm_ptr); +@@ -80,7 +78,7 @@ void write_memo_mbox(struct PilotUser Us + else + printf("\n"); + printf("\n"); +- printf(m.text); ++ printf("%s", m.text); + printf("\n"); + } + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-install-datebook.c pilot-link-0.12.5/src/pilot-install-datebook.c +--- pilot-link-0.12.5-old/src/pilot-install-datebook.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-install-datebook.c 2011-12-20 19:00:42.654177819 +0100 +@@ -106,7 +106,11 @@ int main(int argc, const char *argv[]) + return 1; + } + +- fread(file_text, filelen, 1, f); ++ if (fread(file_text, filelen, 1, f) != 1) { ++ fprintf(stderr," ERROR: Failed to read the %s file.\n", filename); ++ fclose(f); ++ return 1; ++ } + fclose(f); + f = NULL; + +@@ -252,13 +256,13 @@ int main(int argc, const char *argv[]) + dlp_WriteUserInfo(sd, &User); + + if (dlp_AddSyncLogEntry(sd, "Successfully wrote Appointment to Palm.\n" +- "Thank you for using pilot-link.\n") < 0); ++ "Thank you for using pilot-link.\n") < 0) + goto error_close; + +- if(dlp_EndOfSync(sd, 0) < 0); ++ if (dlp_EndOfSync(sd, 0) < 0) + goto error_close; + +- if(pi_close(sd) < 0) ++ if (pi_close(sd) < 0) + goto error; + + error_close: +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-install-expenses.c pilot-link-0.12.5/src/pilot-install-expenses.c +--- pilot-link-0.12.5-old/src/pilot-install-expenses.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-install-expenses.c 2011-12-19 16:05:49.391042875 +0100 +@@ -45,8 +45,8 @@ int main(int argc, const char *argv[]) + size_t size; + int found; + +- unsigned char buf[0xffff]; +- unsigned char *b; ++ char buf[0xffff]; ++ char *b; + pi_buffer_t *appblock; + + struct PilotUser User; +@@ -214,8 +214,7 @@ int main(int argc, const char *argv[]) + b += strlen(theExpense.note) + 1; + + size = b - buf; +- dlp_WriteRecord(sd, (unsigned char)db, 0, 0, category, +- (unsigned char *)buf, size, 0); ++ dlp_WriteRecord(sd, db, 0, 0, category, buf, size, 0); + + /* Close the database */ + dlp_CloseDB(sd, db); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-install-hinote.c pilot-link-0.12.5/src/pilot-install-hinote.c +--- pilot-link-0.12.5-old/src/pilot-install-hinote.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-install-hinote.c 2011-12-20 19:05:05.836653456 +0100 +@@ -164,7 +164,11 @@ int main(int argc, const char *argv[]) + strcpy(file_text, file_arg); + file_text[filenamelen] = '\n'; + +- fread(file_text + filenamelen + 1, filelen, 1, f); ++ if (fread(file_text + filenamelen + 1, filelen, 1, f) != 1) { ++ fprintf(stderr," WARNING: Failed to read from file.\n"); ++ file_text[filenamelen + 1] = '\0'; ++ continue; ++ } + file_text[filenamelen + 1 + filelen] = '\0'; + + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-install-memo.c pilot-link-0.12.5/src/pilot-install-memo.c +--- pilot-link-0.12.5-old/src/pilot-install-memo.c 2009-06-04 15:32:32.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-install-memo.c 2011-12-20 19:26:49.803270983 +0100 +@@ -89,7 +89,6 @@ int install_memo(int sd, int db, int cat + { + struct stat sbuf; + FILE *f = NULL; +- char *tmp = NULL; + char *memo_buf = NULL; + int memo_size, preamble; + +@@ -125,7 +124,11 @@ int install_memo(int sd, int db, int cat + filename, strerror(errno)); + return 1; + } +- fread(memo_buf + preamble, memo_size, 1, f); ++ if (fread(memo_buf + preamble, memo_size, 1, f) != 1) { ++ fprintf(stderr," ERROR: Unable to read from %s\n\n", filename); ++ fclose(f); ++ return 1; ++ } + fclose(f); + + dlp_WriteRecord(sd, db, 0, 0, category, memo_buf, -1, 0); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-install-todo.c pilot-link-0.12.5/src/pilot-install-todo.c +--- pilot-link-0.12.5-old/src/pilot-install-todo.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-install-todo.c 2011-12-20 19:36:06.838721596 +0100 +@@ -76,7 +76,13 @@ int read_file(char *filename, char **tex + return -1; + } + +- fread(*text, filelen, 1, f); ++ if (fread(*text, filelen, 1, f) != 1) { ++ fprintf(stderr," ERROR: Could not read the file %s.\n", filename); ++ fclose(f); ++ return -1; ++ } ++ ++ fclose(f); + + return 0; + } +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-install-todos.c pilot-link-0.12.5/src/pilot-install-todos.c +--- pilot-link-0.12.5-old/src/pilot-install-todos.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-install-todos.c 2011-12-20 19:38:49.488931153 +0100 +@@ -63,7 +63,13 @@ void install_ToDos(int sd, int db, char + exit(EXIT_FAILURE); + } + +- fread(file_text, filelen, 1, f); ++ if (fread(file_text, filelen, 1, f) != 1) { ++ fprintf(stderr," ERROR: Failed to read from file %s.\n", filename); ++ fclose(f); ++ exit(EXIT_FAILURE); ++ } ++ ++ fclose(f); + + cPtr = file_text; + begPtr = cPtr; +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-memos.c pilot-link-0.12.5/src/pilot-memos.c +--- pilot-link-0.12.5-old/src/pilot-memos.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-memos.c 2011-12-21 16:46:00.842502232 +0100 +@@ -113,27 +113,27 @@ write_memo_in_directory(char *dirname, s + mkdir(dirname, 0700); + + /* Create a directory for the category */ +- strncat(pathbuffer, dirname, MAXDIRNAMELEN); +- strncat(pathbuffer, "/", 1); ++ strncat(pathbuffer, dirname, sizeof(pathbuffer) - strlen(pathbuffer) - 1); ++ strncat(pathbuffer, "/", sizeof(pathbuffer) - strlen(pathbuffer) - 1); + + /* Should make sure category doesn't have slashes in it */ +- strncat(pathbuffer, mai.category.name[category], 60); ++ strncat(pathbuffer, mai.category.name[category], sizeof(pathbuffer) - strlen(pathbuffer) - 1); + + /* Should check if pathbuffer exists and is a directory */ + mkdir(pathbuffer, 0700); + + /* Should check if there were problems creating directory */ + /* open the actual file to write */ +- strncat(pathbuffer, "/", 1); ++ strncat(pathbuffer, "/", sizeof(pathbuffer) - strlen(pathbuffer) - 1); + for (j = 0; j < 40; j++) { + if ((!m.text[j]) || (m.text[j] == '\n')) + break; + if (m.text[j] == '/') { +- strncat(pathbuffer, "=2F", 3); ++ strncat(pathbuffer, "=2F", sizeof(pathbuffer) - strlen(pathbuffer) - 1); + continue; + } + if (m.text[j] == '=') { +- strncat(pathbuffer, "=3D", 3); ++ strncat(pathbuffer, "=3D", sizeof(pathbuffer) - strlen(pathbuffer) - 1); + continue; + } + #ifdef OS2 +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-port.c pilot-link-0.12.5/src/pilot-port.c +--- pilot-link-0.12.5-old/src/pilot-port.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-port.c 2011-12-12 16:11:16.697469186 +0100 +@@ -41,7 +41,7 @@ + #include "pi-userland.h" + + +-void do_read(struct pi_socket *ps, int type, char *buffer, int length); ++void do_read(struct pi_socket *ps, int type, unsigned char *buffer, int length); + + /*********************************************************************** + * +@@ -54,7 +54,7 @@ void do_read(struct pi_socket *ps, int t + * Returns: Nothing + * + ***********************************************************************/ +-void do_read(struct pi_socket *ps, int type, char *buffer, int length) ++void do_read(struct pi_socket *ps, int type, unsigned char *buffer, int length) + { + int len; + +@@ -92,8 +92,8 @@ int main(int argc, char *argv[]) + struct pi_socket *ps; + struct sockaddr_in serv_addr; + +- char *buffer, +- *slpbuffer; ++ char *slpbuffer; ++ unsigned char *buffer; + + poptContext pc; + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-read-expenses.c pilot-link-0.12.5/src/pilot-read-expenses.c +--- pilot-link-0.12.5-old/src/pilot-read-expenses.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-read-expenses.c 2011-12-13 18:24:19.844407496 +0100 +@@ -41,8 +41,8 @@ int main(int argc, const char *argv[]) + sd = -1; + enum { mode_none, mode_write = 257 } run_mode = mode_none; + +- char buffer[0xffff]; +- char buffer2[0xffff]; ++ unsigned char buffer[0xffff]; ++ unsigned char buffer2[0xffff]; + pi_buffer_t *recbuf, + *appblock; + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-read-notepad.c pilot-link-0.12.5/src/pilot-read-notepad.c +--- pilot-link-0.12.5-old/src/pilot-read-notepad.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-read-notepad.c 2012-01-04 21:20:20.727758321 +0100 +@@ -39,7 +39,7 @@ + + #ifdef HAVE_PNG + #include "png.h" +-#if (PNG_LIBPNG_VER < 10201) ++#if (PNG_LIBPNG_VER < 10201 || PNG_LIBPNG_VER >= 10400) + #define png_voidp_NULL (png_voidp)NULL + #define png_error_ptr_NULL (png_error_ptr)NULL + #endif +@@ -115,10 +115,15 @@ void write_ppm( FILE *f, struct NotePad + + for( k=0; k<8; k++ ) + { +- if( n->data[i].data & 1<<(7-k) ) +- fwrite( &black, 3, 1, f ); +- else +- fwrite( &white, 3, 1, f ); ++ if( n->data[i].data & 1<<(7-k) ) { ++ if (fwrite( &black, 3, 1, f ) != 1) { ++ fprintf(stderr," WARNING: Failed to write.\n"); ++ } ++ } else { ++ if (fwrite( &white, 3, 1, f ) != 1) { ++ fprintf(stderr," WARNING: Failed to write.\n"); ++ } ++ } + } + } + } +@@ -127,17 +132,27 @@ void write_ppm( FILE *f, struct NotePad + { + for( k=0; k<8; k++ ) + { +- if( n->data[i].repeat & 1<<(7-k) ) +- fwrite( &black, 3, 1, f ); +- else +- fwrite( &white, 3, 1, f ); ++ if( n->data[i].repeat & 1<<(7-k) ) { ++ if (fwrite( &black, 3, 1, f ) != 1) { ++ fprintf(stderr," WARNING: Failed to write.\n"); ++ } ++ } else { ++ if (fwrite( &white, 3, 1, f ) != 1) { ++ fprintf(stderr," WARNING: Failed to write.\n"); ++ } ++ } + } + for( k=0; k<8; k++ ) + { +- if( n->data[i].data & 1<<(7-k) ) +- fwrite( &black, 3, 1, f ); +- else +- fwrite( &white, 3, 1, f ); ++ if( n->data[i].data & 1<<(7-k) ) { ++ if (fwrite( &black, 3, 1, f ) != 1) { ++ fprintf(stderr," WARNING: Failed to write.\n"); ++ } ++ } else { ++ if (fwrite( &white, 3, 1, f ) != 1) { ++ fprintf(stderr," WARNING: Failed to write.\n"); ++ } ++ } + } + } + +@@ -257,7 +272,9 @@ void write_png_v2( FILE *f, struct NoteP + return; + } + +- fwrite( n->data, n->body.dataLen, 1, f ); ++ if (fwrite( n->data, n->body.dataLen, 1, f ) != 1) { ++ fprintf(stderr, "Failed to write."); ++ } + fflush( f ); + } + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-read-palmpix.c pilot-link-0.12.5/src/pilot-read-palmpix.c +--- pilot-link-0.12.5-old/src/pilot-read-palmpix.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-read-palmpix.c 2012-01-04 21:20:45.604415083 +0100 +@@ -42,7 +42,7 @@ + + #ifdef HAVE_PNG + #include "png.h" +-#if (PNG_LIBPNG_VER < 10201) ++#if (PNG_LIBPNG_VER < 10201 || PNG_LIBPNG_VER >= 10400) + #define png_voidp_NULL (png_voidp)NULL + #define png_error_ptr_NULL (png_error_ptr)NULL + #endif +@@ -125,7 +125,7 @@ static int getrecord_pi_socket (struct P + void **buf, size_t *bufsize) + { + +- static char buffer[65536]; ++ static unsigned char buffer[65536]; + static pi_buffer_t fakebuf; + + struct PalmPixState_pi_socket *state = +@@ -199,7 +199,9 @@ void write_ppm (FILE *f, const struct Pa + fprintf (f, "P6\n# %s (taken at %s)\n%d %d\n255\n", + state->pixname, fmt_date (header), header->w, header->h); + +- fwrite (state->pixmap, header->w * header->h * 3, 1, f); ++ if (fwrite (state->pixmap, header->w * header->h * 3, 1, f) != 1) { ++ fprintf(stderr, "ERROR: Failed to write.\n"); ++ } + } + + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-read-screenshot.c pilot-link-0.12.5/src/pilot-read-screenshot.c +--- pilot-link-0.12.5-old/src/pilot-read-screenshot.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-read-screenshot.c 2012-01-04 21:55:29.073067865 +0100 +@@ -40,7 +40,7 @@ + + #ifdef HAVE_PNG + # include "png.h" +-# if (PNG_LIBPNG_VER < 10201) ++# if (PNG_LIBPNG_VER < 10201 || PNG_LIBPNG_VER >= 10400) + # define png_voidp_NULL (png_voidp)NULL + # define png_error_ptr_NULL (png_error_ptr)NULL + # endif +@@ -77,7 +77,7 @@ struct ss_state { + #ifdef HAVE_PNG + void write_png ( char *fname, struct ss_state *state ) + { +- unsigned char *gray_buf; ++ unsigned char *gray_buf = 0; + int i, j; + png_structp png_ptr; + png_infop info_ptr; +@@ -103,7 +103,6 @@ void write_png ( char *fname, struct ss_ + if (setjmp (png_jmpbuf (png_ptr))) + { + png_destroy_write_struct (&png_ptr, &info_ptr); +- fclose (f); + return; + } + +@@ -169,7 +168,9 @@ void write_ppm ( char *fname, struct ss_ + fprintf (f, "255\n" ); + + for( i = 0; i < 3*state->h*state->w; i += 3 ) +- fwrite( &state->pix_map[i], 3, 1, f); ++ if (fwrite( &state->pix_map[i], 3, 1, f) != 1) { ++ fprintf(stderr, "Failed to write to %s\n", fname); ++ } + + fclose( f ); + } +@@ -194,7 +195,7 @@ void WritePictures (int sd, int db, int + // unsigned char inBuf[61440], *pixelBuf; + pi_buffer_t *inBuf, *pixelBuf; + unsigned long clut[256], magic; +- int attr, category, val, mask, j, k; ++ int attr, category, val, mask = 0, j, k; + struct ss_state state; + + if( type == OUT_PPM ) +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-read-todos.c pilot-link-0.12.5/src/pilot-read-todos.c +--- pilot-link-0.12.5-old/src/pilot-read-todos.c 2009-06-04 15:32:32.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-read-todos.c 2011-12-19 16:14:28.191121790 +0100 +@@ -202,8 +202,8 @@ int main(int argc, const char *argv[]) + + for (i = 0;; i++) { + int attr, +- category, +- len; ++ category; ++ size_t len; + + struct ToDo todo; + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-read-veo.c pilot-link-0.12.5/src/pilot-read-veo.c +--- pilot-link-0.12.5-old/src/pilot-read-veo.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-read-veo.c 2012-01-04 22:08:08.269082847 +0100 +@@ -41,7 +41,7 @@ + + #ifdef HAVE_PNG + # include "png.h" +-# if (PNG_LIBPNG_VER < 10201) ++# if (PNG_LIBPNG_VER < 10201 || PNG_LIBPNG_VER >= 10400) + # define png_voidp_NULL (png_voidp)NULL + # define png_error_ptr_NULL (png_error_ptr)NULL + # endif +@@ -676,13 +676,12 @@ int ColourCorrect (struct Veo *v, uint8_ + ***********************************************************************/ + int Gen24bitRow (long flags, int r, struct Veo *v, unsigned char *row) + { +- int i, rawW, rawH, modR = r % 4; ++ int i, rawW, modR = r % 4; + + unsigned char rowA[2560], rowB[2560]; + unsigned char *rAP, *rBP, *rCP; + + rawW = v->width / 2; +- rawH = v->height / 2; + + if (r == 0) + { +@@ -924,7 +923,9 @@ void write_ppm (FILE * f, struct Veo *v, + { + Gen24bitRow (flags, i, v, outBuf); + +- fwrite (outBuf, v->width * 3, 1, f); ++ if (fwrite (outBuf, v->width * 3, 1, f) != 1) { ++ fprintf(stderr, "WARNING: Failed to write.\n"); ++ } + } + } + +@@ -944,7 +945,6 @@ void WritePicture (int sd, int db, int t + char fname[FILENAME_MAX]; + FILE *f; + char extension[8]; +- static int len; + struct Veo v; + pi_buffer_t *inBuf; + int attr, category; +@@ -971,8 +971,7 @@ void WritePicture (int sd, int db, int t + if (sd) + { + inBuf = pi_buffer_new (2560); +- len = +- dlp_ReadRecordByIndex (sd, db, 0, inBuf, 0, &attr, &category); ++ dlp_ReadRecordByIndex (sd, db, 0, inBuf, 0, &attr, &category); + unpack_Veo (&v, inBuf->data, inBuf->used); + pi_buffer_free (inBuf); + v.sd = sd; +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-wav.c pilot-link-0.12.5/src/pilot-wav.c +--- pilot-link-0.12.5-old/src/pilot-wav.c 2009-06-04 15:26:19.000000000 +0200 ++++ pilot-link-0.12.5/src/pilot-wav.c 2012-01-04 22:23:44.024691316 +0100 +@@ -107,31 +107,54 @@ long write_header(FILE * out) + wWaveLength = 0; + + /* RIFF Header */ +- fwrite("RIFF", 4, 1, out); +- fwrite(&wWaveLength, 4, 1, out); +- fwrite("WAVE", 4, 1, out); ++ if ( ++ fwrite("RIFF", 4, 1, out) != 1 ++ || fwrite(&wWaveLength, 4, 1, out) != 1 ++ || fwrite("WAVE", 4, 1, out) != 1 ++ ) { ++ fprintf(stderr," WARNING: Error writing header of wave file.\n"); ++ return 0; ++ } + + /* Format Chunk */ +- fwrite(formatChunkID, 4, 1, out); ++ if (fwrite(formatChunkID, 4, 1, out) != 1) { ++ fprintf(stderr," WARNING: Error writing header of wave file.\n"); ++ return 0; ++ } + + /* Length of Format Chunk - 4 (fmt ) - 4 (length value itself) */ +- fwrite(&formatChunkSize, 4, 1, out); +- fwrite(&wFormatTag, 2, 1, out); +- fwrite(&wChannels, 2, 1, out); +- fwrite(&dwSamplesPerSec, 4, 1, out); +- fwrite(&dwAvgBytesPerSec, 4, 1, out); +- fwrite(&wBlockAlign, 2, 1, out); +- fwrite(&wBitsPerSample, 2, 1, out); ++ if ( ++ fwrite(&formatChunkSize, 4, 1, out) != 1 ++ || fwrite(&wFormatTag, 2, 1, out) != 1 ++ || fwrite(&wChannels, 2, 1, out) != 1 ++ || fwrite(&dwSamplesPerSec, 4, 1, out) != 1 ++ || fwrite(&dwAvgBytesPerSec, 4, 1, out) != 1 ++ || fwrite(&wBlockAlign, 2, 1, out) != 1 ++ || fwrite(&wBitsPerSample, 2, 1, out) != 1 ++ ) { ++ fprintf(stderr," WARNING: Error writing header of wave file.\n"); ++ return 0; ++ } + + /* Extended Format Chunk Fields */ + + /* Extended format block size including(it appears) cbSize itself */ +- fwrite(&cbSize, 2, 1, out); +- fwrite(&wSamplesPerBlock, 2, 1, out); ++ if ( ++ fwrite(&cbSize, 2, 1, out) != 1 ++ || fwrite(&wSamplesPerBlock, 2, 1, out) != 1 ++ ) { ++ fprintf(stderr," WARNING: Error writing header of wave file.\n"); ++ return 0; ++ } + + /* Data Chunk */ +- fwrite(dataChunkID, 4, 1, out); +- fwrite(&dataChunkSize, 4, 1, out); ++ if ( ++ fwrite(dataChunkID, 4, 1, out) != 1 ++ || fwrite(&dataChunkSize, 4, 1, out) != 1 ++ ) { ++ fprintf(stderr," WARNING: Error writing header of wave file.\n"); ++ return 0; ++ } + + return formatChunkSize; + } +@@ -154,10 +177,16 @@ long write_header(FILE * out) + long write_data(char *buffer, int index, int size, long dataChunkSize, FILE *out) + { + if (index == 0) { +- fwrite(buffer + 122, size - 122, 1, out); ++ if (fwrite(buffer + 122, size - 122, 1, out) != 1) { ++ fprintf(stderr," WARNING: Error writing data.\n"); ++ return 0; ++ } + dataChunkSize += size - 122; + } else { +- fwrite(buffer + 8, size - 8, 1, out); ++ if (fwrite(buffer + 8, size - 8, 1, out) != 1) { ++ fprintf(stderr," WARNING: Error writing data.\n"); ++ return 0; ++ } + dataChunkSize += size - 8; + } + return dataChunkSize; +@@ -254,15 +283,19 @@ int fetch_wavs(int sd, char *dbname) + PI_ARGS((sd, db, index, buffer, &id_, + &attr, &category)); + if (ret > 0) { +- dataChunkSize = write_data(buffer->data, index, buffer->used, dataChunkSize, out); ++ dataChunkSize = write_data((char *)buffer->data, index, buffer->used, dataChunkSize, out); + } + index++; + } + wWaveLength = 4 + 4 + 4 + formatChunkSize + 4 + 4 + dataChunkSize; + fseek(out, 44, SEEK_SET); +- fwrite(&dataChunkSize, 4, 1, out); ++ if (fwrite(&dataChunkSize, 4, 1, out) != 1) { ++ fprintf(stderr," WARNING: Error writing data.\n"); ++ } + fseek(out, 4, SEEK_SET); +- fwrite(&wWaveLength, 4, 1, out); ++ if (fwrite(&wWaveLength, 4, 1, out) != 1) { ++ fprintf(stderr," WARNING: Error writing data.\n"); ++ } + dlp_CloseDB(sd, db); + fclose(out); + if (!plu_quiet) { +@@ -288,12 +321,11 @@ int fetch_wavs(int sd, char *dbname) + ***********************************************************************/ + int do_fetch(char *dbname) + { +- int sd = -1, +- ret; ++ int sd = -1; + + sd = plu_connect(); + +- ret = fetch_wavs(sd, dbname); ++ fetch_wavs(sd, dbname); + + dlp_EndOfSync(sd, dlpEndCodeNormal); + pi_close(sd); +@@ -364,9 +396,13 @@ int pdb_to_wav(char *filename) + } + wWaveLength = 4 + 4 + 4 + formatChunkSize + 4 + 4 + dataChunkSize; + fseek(out, 44, SEEK_SET); +- fwrite(&dataChunkSize, 4, 1, out); ++ if (fwrite(&dataChunkSize, 4, 1, out) != 1) { ++ fprintf(stderr," WARNING: Error writing data.\n"); ++ } + fseek(out, 4, SEEK_SET); +- fwrite(&wWaveLength, 4, 1, out); ++ if (fwrite(&wWaveLength, 4, 1, out) != 1) { ++ fprintf(stderr," WARNING: Error writing data.\n"); ++ } + fclose(out); + pi_file_close(pi_fp); + if (!plu_quiet) { +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/src/pilot-xfer.c pilot-link-0.12.5/src/pilot-xfer.c +--- pilot-link-0.12.5-old/src/pilot-xfer.c 2010-02-07 03:21:18.000000000 +0100 ++++ pilot-link-0.12.5/src/pilot-xfer.c 2012-01-04 22:28:32.040166439 +0100 +@@ -713,7 +713,6 @@ pi_file_retrieve_VFS(const int fd, const + pi_buffer_t *buffer; + ssize_t readsize,writesize; + int filesize; +- int original_filesize; + int written_so_far; + pi_progress_t progress; + +@@ -762,7 +761,6 @@ pi_file_retrieve_VFS(const int fd, const + } + + dlp_VFSFileSize(socket,file,&filesize); +- original_filesize = filesize; + + memset(&progress, 0, sizeof(progress)); + progress.type = PI_PROGRESS_RECEIVE_VFS; +@@ -2478,7 +2476,7 @@ main(int argc, const char *argv[]) + fprintf(stderr, " ERROR: '%s' is not a directory or does not exist.\n" + " Please supply a directory name when performing a " + "backup or restore and try again.\n\n", dirname); +- fprintf(stderr,gracias); ++ fprintf(stderr, "%s", gracias); + return 1; + } + } +@@ -2488,13 +2486,13 @@ main(int argc, const char *argv[]) + if (rargc > 0) + { + fprintf(stderr," ERROR: Do not pass additional arguments to -busrlLC.\n"); +- fprintf(stderr,gracias); ++ fprintf(stderr, "%s", gracias); + return 1; + } + break; + case palm_op_noop: + fprintf(stderr," ERROR: Must specify one of -bursimfdlC.\n"); +- fprintf(stderr,gracias); ++ fprintf(stderr, "%s", gracias); + return 1; + break; + case palm_op_merge: +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/tests/calendardb-test.c pilot-link-0.12.5/tests/calendardb-test.c +--- pilot-link-0.12.5-old/tests/calendardb-test.c 2010-02-07 03:21:18.000000000 +0100 ++++ pilot-link-0.12.5/tests/calendardb-test.c 2012-01-13 16:04:45.000000000 +0100 +@@ -225,7 +225,7 @@ void parse(pi_file_t *pf) + + if(pi_buf->used != test->used) { + int i; +- printf("Error: Different record sizes unpack: %ld pack: %ld last byte unpack: 0x%02X pack: 0x%02X\n", pi_buf->used, test->used, pi_buf->data[pi_buf->used-1], test->data[test->used-1]); ++ printf("Error: Different record sizes unpack: %zd pack: %zd last byte unpack: 0x%02X pack: 0x%02X\n", pi_buf->used, test->used, pi_buf->data[pi_buf->used-1], test->data[test->used-1]); + for(i=0; i<pi_buf->used; ++i) { + if(pi_buf->data[i] != test->data[i]) { + printf("Error: Byte %d is different unpack: 0x%02X pack: 0x%02X\n", i, pi_buf->data[i], test->data[i]); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/tests/contactsdb-test.c pilot-link-0.12.5/tests/contactsdb-test.c +--- pilot-link-0.12.5-old/tests/contactsdb-test.c 2009-05-25 05:22:56.000000000 +0200 ++++ pilot-link-0.12.5/tests/contactsdb-test.c 2011-12-14 17:30:21.000000000 +0100 +@@ -31,6 +31,7 @@ + #include "pi-header.h" + #include "pi-appinfo.h" + #include "pi-contact.h" ++#include "pi-userland.h" + + #undef PRINT_USELESS_INFO + #undef SAVE_PICTURES +@@ -319,7 +320,7 @@ print_records (int sd, int db, struct Co + fclose (f); + } + #else +- printf (" Picture : JPEG (%zu bytes)\n", ++ printf (" Picture : JPEG (%u bytes)\n", + c.picture->length); + #endif /* SAVE_PICTURES */ + } +@@ -345,7 +346,8 @@ main (const int argc, const char **argv) + return 1; + } + +- sd = pilot_connect (argv[1]); ++ setenv("PILOTPORT", argv[1], 1); ++ sd = plu_connect(); + + if (sd < 0) + goto error; +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/tests/locationdb-test.c pilot-link-0.12.5/tests/locationdb-test.c +--- pilot-link-0.12.5-old/tests/locationdb-test.c 2009-02-22 09:09:02.000000000 +0100 ++++ pilot-link-0.12.5/tests/locationdb-test.c 2012-01-13 16:05:12.000000000 +0100 +@@ -149,7 +149,7 @@ void parse(pi_file_t *pf) + + if(pi_buf->used != test->used) { + int i; +- printf("Error: Different record sizes unpack: %d pack: %d last byte unpack: 0x%02X pack: 0x%02X\n", pi_buf->used, test->used, pi_buf->data[pi_buf->used-1], test->data[test->used-1]); ++ printf("Error: Different record sizes unpack: %zu pack: %zu last byte unpack: 0x%02X pack: 0x%02X\n", pi_buf->used, test->used, pi_buf->data[pi_buf->used-1], test->data[test->used-1]); + for(i=0; i<pi_buf->used; ++i) { + if(pi_buf->data[i] != test->data[i]) { + printf("Error: Byte %d is different unpack: 0x%02X pack: 0x%02X\n", i, pi_buf->data[i], test->data[i]); +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/tests/Makefile.am pilot-link-0.12.5/tests/Makefile.am +--- pilot-link-0.12.5-old/tests/Makefile.am 2009-05-25 06:32:06.000000000 +0200 ++++ pilot-link-0.12.5/tests/Makefile.am 2011-12-19 13:21:52.692923303 +0100 +@@ -1,5 +1,4 @@ + INCLUDES = \ +- -I../include \ + -I$(top_srcdir)/include \ + $(POPT_INCLUDES) + +@@ -24,7 +23,8 @@ locationdb_test_LDADD = \ + contactsdb_test_SOURCES = \ + contactsdb-test.c + contactsdb_test_LDADD = \ +- $(top_builddir)/libpisock/libpisock.la ++ $(top_builddir)/libpisock/libpisock.la \ ++ $(top_builddir)/src/libpiuserland.la + + dlp_test_SOURCES = \ + dlp-test.c +@@ -34,7 +34,8 @@ dlp_test_LDADD = \ + vfs_test_SOURCES = \ + vfs-test.c + vfs_test_LDADD = \ +- $(top_builddir)/libpisock/libpisock.la ++ $(top_builddir)/libpisock/libpisock.la \ ++ $(top_builddir)/src/libpiuserland.la + + versamail_test_SOURCES = \ + versamail-test.c +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/tests/Makefile.in pilot-link-0.12.5/tests/Makefile.in +--- pilot-link-0.12.5-old/tests/Makefile.in 2012-01-04 17:53:04.788589991 +0100 ++++ pilot-link-0.12.5/tests/Makefile.in 2012-01-04 22:52:56.840844137 +0100 +@@ -63,7 +63,8 @@ calendardb_test_OBJECTS = $(am_calendard + calendardb_test_DEPENDENCIES = $(top_builddir)/libpisock/libpisock.la + am_contactsdb_test_OBJECTS = contactsdb-test.$(OBJEXT) + contactsdb_test_OBJECTS = $(am_contactsdb_test_OBJECTS) +-contactsdb_test_DEPENDENCIES = $(top_builddir)/libpisock/libpisock.la ++contactsdb_test_DEPENDENCIES = $(top_builddir)/libpisock/libpisock.la \ ++ $(top_builddir)/src/libpiuserland.la + am_dlp_test_OBJECTS = dlp-test.$(OBJEXT) + dlp_test_OBJECTS = $(am_dlp_test_OBJECTS) + dlp_test_DEPENDENCIES = $(top_builddir)/libpisock/libpisock.la +@@ -78,7 +79,8 @@ versamail_test_OBJECTS = $(am_versamail_ + versamail_test_DEPENDENCIES = $(top_builddir)/libpisock/libpisock.la + am_vfs_test_OBJECTS = vfs-test.$(OBJEXT) + vfs_test_OBJECTS = $(am_vfs_test_OBJECTS) +-vfs_test_DEPENDENCIES = $(top_builddir)/libpisock/libpisock.la ++vfs_test_DEPENDENCIES = $(top_builddir)/libpisock/libpisock.la \ ++ $(top_builddir)/src/libpiuserland.la + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -288,7 +290,6 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + usb_libs = @usb_libs@ + INCLUDES = \ +- -I../include \ + -I$(top_srcdir)/include \ + $(POPT_INCLUDES) + +@@ -308,7 +309,8 @@ contactsdb_test_SOURCES = \ + contactsdb-test.c + + contactsdb_test_LDADD = \ +- $(top_builddir)/libpisock/libpisock.la ++ $(top_builddir)/libpisock/libpisock.la \ ++ $(top_builddir)/src/libpiuserland.la + + dlp_test_SOURCES = \ + dlp-test.c +@@ -320,7 +322,8 @@ vfs_test_SOURCES = \ + vfs-test.c + + vfs_test_LDADD = \ +- $(top_builddir)/libpisock/libpisock.la ++ $(top_builddir)/libpisock/libpisock.la \ ++ $(top_builddir)/src/libpiuserland.la + + versamail_test_SOURCES = \ + versamail-test.c +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/tests/packers.c pilot-link-0.12.5/tests/packers.c +--- pilot-link-0.12.5-old/tests/packers.c 2005-06-16 17:38:28.000000000 +0200 ++++ pilot-link-0.12.5/tests/packers.c 2011-12-20 16:33:46.072123761 +0100 +@@ -20,13 +20,14 @@ + #include "pi-dlp.h" + #include "pi-expense.h" + #include "pi-mail.h" ++#include "pi-debug.h" + + unsigned char seed; +-char *target; ++unsigned char *target; + int targetlen; + + +-void reset_block(char *buffer, int len) ++void reset_block(unsigned char *buffer, int len) + { + unsigned int i; + +@@ -34,19 +35,19 @@ void reset_block(char *buffer, int len) + buffer[i] = (i + seed) & 0xff; + } + +-int check_block(int test, const char *buffer, int len, int start, ++int check_block(int test, const unsigned char *buffer, int len, int start, + int count, const char *name) + { + unsigned int i; + int fore = 0, aft = 0; + + for (i = 0; i < start; i++) +- if (buffer[i] != (char) ((i + seed) & 0xff)) { ++ if (buffer[i] != ((i + seed) & 0xff)) { + fore = start - i; + break; + } + for (i = start + count; i < len; i++) +- if (buffer[i] != (char) ((i + seed) & 0xff)) { ++ if (buffer[i] != ((i + seed) & 0xff)) { + aft = i - start; + break; + } +@@ -64,7 +65,7 @@ int check_block(int test, const char *bu + return 0; + } + +-char MemoAppBlock[17 * 16 + 10] = "\ ++unsigned char MemoAppBlock[17 * 16 + 10] = "\ + \x00\x00\x55\x6e\x66\x69\x6c\x65\x64\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x42\x75\x73\x69\x6e\x65\x73\x73\x00\x00\x00\x00\x00\x00\ + \x00\x00\x50\x65\x72\x73\x6f\x6e\x61\x6c\x00\x00\x00\x00\x00\x00\ +@@ -84,7 +85,7 @@ char MemoAppBlock[17 * 16 + 10] = "\ + \x00\x00\x00\x01\x02\x10\x11\x12\x13\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x13\x00\x00\x00\x00\x00\x01\x00"; + +-char MemoRecord[3 * 16 + 7] = "\ ++unsigned char MemoRecord[3 * 16 + 7] = "\ + \x61\x61\x4d\x61\x6b\x65\x66\x69\x6c\x65\x0a\x52\x45\x41\x44\x4d\ + \x45\x0a\x6c\x69\x63\x65\x6e\x73\x65\x2e\x74\x65\x72\x6d\x73\x0a\ + \x70\x69\x6c\x6f\x74\x6c\x69\x6e\x6b\x2e\x63\x0a\x74\x65\x73\x74\ +@@ -103,7 +104,7 @@ int test_memo() + if (l != sizeof(MemoAppBlock)) { + errors++; + printf +- ("1: unpack_MemoAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("1: unpack_MemoAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MemoAppBlock)); + } + +@@ -112,7 +113,7 @@ int test_memo() + if (l != sizeof(MemoAppBlock)) { + errors++; + printf +- ("2: unpack_MemoAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("2: unpack_MemoAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MemoAppBlock)); + } + +@@ -141,7 +142,7 @@ int test_memo() + if (l != sizeof(MemoAppBlock)) { + errors++; + printf +- ("5: unpack_MemoAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("5: unpack_MemoAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MemoAppBlock)); + } + +@@ -205,7 +206,7 @@ int test_memo() + if (l != sizeof(MemoAppBlock)) { + errors++; + printf +- ("7: pack_MemoAppInfo returned incorrect allocation length (got %d, expected %d)\n", ++ ("7: pack_MemoAppInfo returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(MemoAppBlock)); + } + +@@ -230,7 +231,7 @@ int test_memo() + if (l != sizeof(MemoAppBlock)) { + errors++; + printf +- ("10: pack_MemoAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("10: pack_MemoAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MemoAppBlock)); + } + +@@ -271,7 +272,7 @@ int test_memo() + if (RecordBuffer->used != sizeof(MemoRecord)) { + errors++; + printf +- ("15: pack_MemoRecord returned incorrect allocation length (got %d, expected %d)\n", ++ ("15: pack_MemoRecord returned incorrect allocation length (got %lu, expected %lu)\n", + RecordBuffer->used, sizeof(MemoRecord)); + } + +@@ -290,7 +291,7 @@ int test_memo() + return errors; + } + +-char AddressAppBlock[39 * 16 + 14] = "\ ++unsigned char AddressAppBlock[39 * 16 + 14] = "\ + \x00\x10\x55\x6e\x66\x69\x6c\x65\x64\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x42\x75\x73\x69\x6e\x65\x73\x73\x00\x00\x00\x00\x00\x00\ + \x00\x00\x50\x65\x72\x73\x6f\x6e\x61\x6c\x00\x00\x00\x00\x00\x00\ +@@ -332,7 +333,7 @@ char AddressAppBlock[39 * 16 + 14] = "\ + \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x4d\x6f\x62\x69\x6c\x65\ + \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x17\x00\x00\x00"; + +-char AddressRecord[2 * 16 + 12] = "\ ++unsigned char AddressRecord[2 * 16 + 12] = "\ + \x00\x14\x32\x10\x00\x04\x41\x03\x00\x53\x68\x61\x77\x00\x42\x65\ + \x72\x6e\x61\x72\x64\x00\x4e\x6f\x6e\x65\x20\x6b\x6e\x6f\x77\x6e\ + \x00\x43\x31\x00\x41\x20\x6e\x6f\x74\x65\x2e\x00"; +@@ -352,7 +353,7 @@ int test_address() + if (l != sizeof(AddressAppBlock)) { + errors++; + printf +- ("1: unpack_AddressAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("1: unpack_AddressAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(AddressAppBlock)); + } + +@@ -363,7 +364,7 @@ int test_address() + if (l != sizeof(AddressAppBlock)) { + errors++; + printf +- ("2: unpack_AddressAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("2: unpack_AddressAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(AddressAppBlock)); + } + +@@ -396,7 +397,7 @@ int test_address() + if (l != sizeof(AddressAppBlock)) { + errors++; + printf +- ("5: unpack_AddressAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("5: unpack_AddressAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(AddressAppBlock)); + } + +@@ -458,7 +459,7 @@ int test_address() + if (l != sizeof(AddressAppBlock)) { + errors++; + printf +- ("7: pack_AddressAppInfo returned incorrect allocation length (got %d, expected %d)\n", ++ ("7: pack_AddressAppInfo returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(AddressAppBlock)); + } + +@@ -484,7 +485,7 @@ int test_address() + if (l != sizeof(AddressAppBlock)) { + errors++; + printf +- ("10: pack_AddressAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("10: pack_AddressAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(AddressAppBlock)); + } + +@@ -534,7 +535,7 @@ int test_address() + if (RecordBuffer->used != sizeof(AddressRecord)) { + errors++; + printf +- ("15: pack_Address returned incorrect length (got %d, expected %d)\n", ++ ("15: pack_Address returned incorrect length (got %lu, expected %lu)\n", + RecordBuffer->used, sizeof(AddressRecord)); + } + +@@ -553,7 +554,7 @@ int test_address() + return errors; + } + +-char AppointmentAppBlock[17 * 16 + 8] = "\ ++unsigned char AppointmentAppBlock[17 * 16 + 8] = "\ + \x00\x00\x55\x6e\x66\x69\x6c\x65\x64\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\ +@@ -577,7 +578,7 @@ char AppointmentAppBlock[17 * 16 + 8] = + and thus have a floating value. This sample record has + been altered to make theses bytes zero, to match what our + packing code generates. */ +-char AppointmentRecord[2 * 16 + 3] = "\ ++unsigned char AppointmentRecord[2 * 16 + 3] = "\ + \x09\x00\x0d\x28\xbb\x02\x7c\x00\x1d\x02\x02\x00\xbd\x24\x02\x55\ + \x00\x00\x00\x01\xbb\x0c\x47\x65\x6f\x72\x67\x65\x00\x4e\x6f\x74\ + \x65\x21\x00"; +@@ -598,7 +599,7 @@ int test_appointment() + if (l != sizeof(AppointmentAppBlock)) { + errors++; + printf +- ("1: unpack_AppointmentAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("1: unpack_AppointmentAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(AppointmentAppBlock)); + } + +@@ -609,7 +610,7 @@ int test_appointment() + if (l != sizeof(AppointmentAppBlock)) { + errors++; + printf +- ("2: unpack_AppointmentAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("2: unpack_AppointmentAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(AppointmentAppBlock)); + } + +@@ -642,7 +643,7 @@ int test_appointment() + if (l != sizeof(AppointmentAppBlock)) { + errors++; + printf +- ("5: unpack_AppointmentAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("5: unpack_AppointmentAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(AppointmentAppBlock)); + } + +@@ -707,7 +708,7 @@ int test_appointment() + if (l != sizeof(AppointmentAppBlock)) { + errors++; + printf +- ("7: pack_AppointmentAppInfo returned incorrect allocation length (got %d, expected %d)\n", ++ ("7: pack_AppointmentAppInfo returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(AppointmentAppBlock)); + } + +@@ -733,7 +734,7 @@ int test_appointment() + if (l != sizeof(AppointmentAppBlock)) { + errors++; + printf +- ("10: pack_AppointmentAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("10: pack_AppointmentAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(AppointmentAppBlock)); + } + +@@ -785,7 +786,7 @@ int test_appointment() + if (RecordBuffer->used != sizeof(AppointmentRecord)) { + errors++; + printf +- ("15: pack_Appointment returned incorrect length (got %d, expected %d)\n", ++ ("15: pack_Appointment returned incorrect length (got %lu, expected %lu)\n", + RecordBuffer->used, sizeof(AppointmentRecord)); + } + +@@ -804,7 +805,7 @@ int test_appointment() + return errors; + } + +-char ToDoAppBlock[17 * 16 + 10] = "\ ++unsigned char ToDoAppBlock[17 * 16 + 10] = "\ + \x00\x08\x55\x6e\x66\x69\x6c\x65\x64\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x42\x75\x73\x69\x6e\x65\x73\x73\x00\x00\x00\x00\x00\x00\ + \x00\x00\x50\x65\x72\x73\x6f\x6e\x61\x6c\x00\x00\x00\x00\x00\x00\ +@@ -824,7 +825,7 @@ char ToDoAppBlock[17 * 16 + 10] = "\ + \x00\x00\x00\x01\x02\x11\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x11\x00\x00\x00\xff\xff\x01\x00"; + +-char ToDoRecord[1 * 16 + 1] = "\ ++unsigned char ToDoRecord[1 * 16 + 1] = "\ + \xbb\x09\x05\x54\x6f\x64\x6f\x33\x00\x41\x20\x6e\x6f\x74\x65\x2e\ + \x00"; + +@@ -841,7 +842,7 @@ int test_todo() + if (l != sizeof(ToDoAppBlock)) { + errors++; + printf +- ("1: unpack_ToDoAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("1: unpack_ToDoAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ToDoAppBlock)); + } + +@@ -850,7 +851,7 @@ int test_todo() + if (l != sizeof(ToDoAppBlock)) { + errors++; + printf +- ("2: unpack_ToDoAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("2: unpack_ToDoAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ToDoAppBlock)); + } + +@@ -877,7 +878,7 @@ int test_todo() + if (l != sizeof(ToDoAppBlock)) { + errors++; + printf +- ("5: unpack_ToDoAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("5: unpack_ToDoAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ToDoAppBlock)); + } + +@@ -941,7 +942,7 @@ int test_todo() + if (l != sizeof(ToDoAppBlock)) { + errors++; + printf +- ("7: pack_ToDoAppInfo returned incorrect allocation length (got %d, expected %d)\n", ++ ("7: pack_ToDoAppInfo returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(ToDoAppBlock)); + } + +@@ -966,7 +967,7 @@ int test_todo() + if (l != sizeof(ToDoAppBlock)) { + errors++; + printf +- ("10: pack_ToDoAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("10: pack_ToDoAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ToDoAppBlock)); + } + +@@ -1020,7 +1021,7 @@ int test_todo() + if (RecordBuffer->used != sizeof(ToDoRecord)) { + errors++; + printf +- ("15: pack_ToDo returned incorrect length (got %d, expected %d)\n", ++ ("15: pack_ToDo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ToDoRecord)); + } + +@@ -1039,7 +1040,7 @@ int test_todo() + return errors; + } + +-char ExpenseAppBlock[24 * 16 + 8] = "\ ++unsigned char ExpenseAppBlock[24 * 16 + 8] = "\ + \x00\x00\x55\x6e\x66\x69\x6c\x65\x64\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x4e\x65\x77\x20\x59\x6f\x72\x6b\x00\x00\x00\x00\x00\x00\ + \x00\x00\x50\x61\x72\x69\x73\x00\x00\x00\x00\x00\x00\x00\x00\x00\ +@@ -1067,7 +1068,7 @@ char ExpenseAppBlock[24 * 16 + 8] = "\ + \x00\x00\x00\x00\x00\x00\x00\x00"; + + /* Byte five is floating */ +-char ExpenseRecord[1 * 16 + 14] = "\ ++unsigned char ExpenseRecord[1 * 16 + 14] = "\ + \xbb\x2a\x09\x01\x08\x00\x32\x39\x2e\x37\x32\x00\x55\x00\x43\x00\ + \x41\x74\x74\x00\x54\x68\x65\x20\x6e\x6f\x74\x65\x2e\x00"; + +@@ -1086,7 +1087,7 @@ int test_expense() + if (l != sizeof(ExpenseAppBlock)) { + errors++; + printf +- ("1: unpack_ExpenseAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("1: unpack_ExpenseAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ExpenseAppBlock)); + } + +@@ -1097,7 +1098,7 @@ int test_expense() + if (l != sizeof(ExpenseAppBlock)) { + errors++; + printf +- ("2: unpack_ExpenseAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("2: unpack_ExpenseAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ExpenseAppBlock)); + } + +@@ -1115,7 +1116,7 @@ int test_expense() + if (l != sizeof(ExpenseAppBlock)) { + errors++; + printf +- ("3: unpack_ExpenseAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("3: unpack_ExpenseAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ExpenseAppBlock)); + } + +@@ -1180,7 +1181,7 @@ int test_expense() + if (l != sizeof(ExpenseAppBlock)) { + errors++; + printf +- ("5: pack_ExpenseAppInfo returned incorrect allocation length (got %d, expected %d)\n", ++ ("5: pack_ExpenseAppInfo returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(ExpenseAppBlock)); + } + +@@ -1206,7 +1207,7 @@ int test_expense() + if (l != sizeof(ExpenseAppBlock)) { + errors++; + printf +- ("8: pack_ExpenseAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("8: pack_ExpenseAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ExpenseAppBlock)); + } + +@@ -1229,7 +1230,7 @@ int test_expense() + if (l != sizeof(ExpenseRecord)) { + errors++; + printf +- ("11: unpack_Expense returned incorrect length (got %d, expected %d)\n", ++ ("11: unpack_Expense returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ExpenseRecord)); + } + +@@ -1256,7 +1257,7 @@ int test_expense() + if (l != sizeof(ExpenseRecord)) { + errors++; + printf +- ("13: pack_Expense returned incorrect allocation length (got %d, expected %d)\n", ++ ("13: pack_Expense returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(ExpenseRecord)); + } + +@@ -1281,7 +1282,7 @@ int test_expense() + if (l != sizeof(ExpenseRecord)) { + errors++; + printf +- ("16: pack_Expense returned incorrect length (got %d, expected %d)\n", ++ ("16: pack_Expense returned incorrect length (got %d, expected %lu)\n", + l, sizeof(ExpenseRecord)); + } + +@@ -1302,7 +1303,7 @@ int test_expense() + return errors; + } + +-char MailAppBlock[18 * 16 + 1] = "\ ++unsigned char MailAppBlock[18 * 16 + 1] = "\ + \x00\x1f\x49\x6e\x62\x6f\x78\x00\x00\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x4f\x75\x74\x62\x6f\x78\x00\x00\x00\x00\x00\x00\x00\x00\ + \x00\x00\x44\x65\x6c\x65\x74\x65\x64\x00\x00\x00\x00\x00\x00\x00\ +@@ -1323,14 +1324,14 @@ char MailAppBlock[18 * 16 + 1] = "\ + \x0e\x0f\x0f\x00\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x01\x20\ + \x00"; + +-char MailRecord[1 * 16 + 2] = "\ ++unsigned char MailRecord[1 * 16 + 2] = "\ + \x00\x00\x00\x00\x78\x00\x43\x00\x00\x61\x00\x62\x00\x00\x00\x00\ + \x44\x00"; /*\x27"; This byte seems to be spurious */ + +-char MailSigPreference[3] = "\ ++unsigned char MailSigPreference[3] = "\ + \x61\x62\x00"; + +-char MailSyncPreference[13] = "\ ++unsigned char MailSyncPreference[13] = "\ + \x02\x01\x00\x00\x17\x70\x61\x74\x00\x6c\x64\x00\x00"; + + int test_mail() +@@ -1347,7 +1348,7 @@ int test_mail() + if (l != sizeof(MailAppBlock)) { + errors++; + printf +- ("1: unpack_MailAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("1: unpack_MailAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailAppBlock)); + } + +@@ -1356,7 +1357,7 @@ int test_mail() + if (l != sizeof(MailAppBlock)) { + errors++; + printf +- ("2: unpack_MailAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("2: unpack_MailAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailAppBlock)); + } + +@@ -1372,7 +1373,7 @@ int test_mail() + if (l != sizeof(MailAppBlock)) { + errors++; + printf +- ("3: unpack_MailAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("3: unpack_MailAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailAppBlock)); + } + +@@ -1437,7 +1438,7 @@ int test_mail() + if (l != sizeof(MailAppBlock)) { + errors++; + printf +- ("5: pack_MailAppInfo returned incorrect allocation length (got %d, expected %d)\n", ++ ("5: pack_MailAppInfo returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(MailAppBlock)); + } + +@@ -1462,7 +1463,7 @@ int test_mail() + if (l != sizeof(MailAppBlock)) { + errors++; + printf +- ("8: pack_MailAppInfo returned incorrect length (got %d, expected %d)\n", ++ ("8: pack_MailAppInfo returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailAppBlock)); + } + +@@ -1485,7 +1486,7 @@ int test_mail() + if (l != sizeof(MailRecord)) { + errors++; + printf +- ("11: unpack_Mail returned incorrect length (got %d, expected %d)\n", ++ ("11: unpack_Mail returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailRecord)); + } + +@@ -1512,7 +1513,7 @@ int test_mail() + if (l != sizeof(MailRecord)) { + errors++; + printf +- ("13: pack_Mail returned incorrect allocation length (got %d, expected %d)\n", ++ ("13: pack_Mail returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(MailRecord)); + } + +@@ -1536,7 +1537,7 @@ int test_mail() + if (l != sizeof(MailRecord)) { + errors++; + printf +- ("16: pack_Mail returned incorrect length (got %d, expected %d)\n", ++ ("16: pack_Mail returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailRecord)); + } + +@@ -1560,7 +1561,7 @@ int test_mail() + if (l != sizeof(MailSyncPreference)) { + errors++; + printf +- ("19: unpack_MailSyncPref returned incorrect length (got %d, expected %d)\n", ++ ("19: unpack_MailSyncPref returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailSyncPreference)); + } + +@@ -1571,7 +1572,7 @@ int test_mail() + if (l != sizeof(MailSyncPreference)) { + errors++; + printf +- ("20: unpack_MailSyncPref returned incorrect length (got %d, expected %d)\n", ++ ("20: unpack_MailSyncPref returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailSyncPreference)); + } + +@@ -1582,7 +1583,7 @@ int test_mail() + if (l != sizeof(MailSyncPreference)) { + errors++; + printf +- ("21: unpack_MailSyncPref returned incorrect length (got %d, expected %d)\n", ++ ("21: unpack_MailSyncPref returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailSyncPreference)); + } + +@@ -1609,7 +1610,7 @@ int test_mail() + if (l != sizeof(MailSyncPreference)) { + errors++; + printf +- ("23: pack_MailSyncPref returned incorrect allocation length (got %d, expected %d)\n", ++ ("23: pack_MailSyncPref returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(MailSyncPreference)); + } + +@@ -1635,7 +1636,7 @@ int test_mail() + if (l != sizeof(MailSyncPreference)) { + errors++; + printf +- ("26: pack_MailSyncPref returned incorrect length (got %d, expected %d)\n", ++ ("26: pack_MailSyncPref returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailSyncPreference)); + } + +@@ -1661,7 +1662,7 @@ int test_mail() + if (l != sizeof(MailSigPreference)) { + errors++; + printf +- ("29: unpack_MailSigPref returned incorrect length (got %d, expected %d)\n", ++ ("29: unpack_MailSigPref returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailSyncPreference)); + } + +@@ -1672,7 +1673,7 @@ int test_mail() + if (l != sizeof(MailSigPreference)) { + errors++; + printf +- ("30: unpack_MailSigPref returned incorrect length (got %d, expected %d)\n", ++ ("30: unpack_MailSigPref returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailSyncPreference)); + } + +@@ -1683,7 +1684,7 @@ int test_mail() + if (l != sizeof(MailSigPreference)) { + errors++; + printf +- ("31: unpack_MailSigPref returned incorrect length (got %d, expected %d)\n", ++ ("31: unpack_MailSigPref returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailSyncPreference)); + } + +@@ -1710,7 +1711,7 @@ int test_mail() + if (l != sizeof(MailSigPreference)) { + errors++; + printf +- ("33: pack_MailSignaturePref returned incorrect allocation length (got %d, expected %d)\n", ++ ("33: pack_MailSignaturePref returned incorrect allocation length (got %d, expected %lu)\n", + l, sizeof(MailSigPreference)); + } + +@@ -1736,7 +1737,7 @@ int test_mail() + if (l != sizeof(MailSigPreference)) { + errors++; + printf +- ("36: pack_MailSignaturePref returned incorrect length (got %d, expected %d)\n", ++ ("36: pack_MailSignaturePref returned incorrect length (got %d, expected %lu)\n", + l, sizeof(MailSigPreference)); + } + +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/tests/versamail-test.c pilot-link-0.12.5/tests/versamail-test.c +--- pilot-link-0.12.5-old/tests/versamail-test.c 2005-04-21 17:21:30.000000000 +0200 ++++ pilot-link-0.12.5/tests/versamail-test.c 2011-12-14 16:39:27.926393327 +0100 +@@ -186,7 +186,7 @@ int main(int argc, char *argv[]) + { + struct pi_file *pi_fp; + char *DBname; +- int r; ++ int r = 0; + int idx; + size_t size; + int attr; +diff -upr -x '*.deps*' -x '*Makefile' -x '*config.*' pilot-link-0.12.5-old/tests/vfs-test.c pilot-link-0.12.5/tests/vfs-test.c +--- pilot-link-0.12.5-old/tests/vfs-test.c 2007-02-05 10:48:10.000000000 +0100 ++++ pilot-link-0.12.5/tests/vfs-test.c 2011-12-14 20:07:53.702893697 +0100 +@@ -35,6 +35,7 @@ + #include "pi-error.h" + #include "pi-source.h" + #include "pi-header.h" ++#include "pi-userland.h" + + + /* For various protocol versions, set to 0 to not test those versions */ +@@ -77,7 +78,8 @@ int main (int argc, char **argv) + + unsigned long flags; + +- sd = pilot_connect (argv[1]); ++ setenv("PILOTPORT", argv[1], 1); ++ sd = plu_connect(); + if (sd < 0) return 1; + + t1 = time (NULL); +@@ -297,7 +299,7 @@ int main (int argc, char **argv) + LOG((PI_DBG_USER, PI_DBG_LVL_INFO, "* ERROR: File read: read %d instead of the expected %d\n", len, strlen (name))); + } else if (memcmp (name, fileBuf->data, fileBuf->used)) { + LOG((PI_DBG_USER, PI_DBG_LVL_INFO, "* ERROR: File read: read data mismatch\n", fileBuf->used, strlen (name))); +- pi_dumpdata (name, fileBuf->used); ++ pi_dumpdata ((unsigned char*)name, fileBuf->used); + pi_dumpdata (fileBuf->data, fileBuf->used); + } else { + LOG((PI_DBG_USER, PI_DBG_LVL_INFO, "* File read: successfully read the data back\n")); diff --git a/source/l/pilot-link/pilot-link-0.12.5-ftbfs-f19.patch b/source/l/pilot-link/pilot-link-0.12.5-ftbfs-f19.patch new file mode 100644 index 000000000..5dfff20ab --- /dev/null +++ b/source/l/pilot-link/pilot-link-0.12.5-ftbfs-f19.patch @@ -0,0 +1,24 @@ +diff -up pilot-link-0.12.5/libpisock/md5.c.ftbfs-f19 pilot-link-0.12.5/libpisock/md5.c +--- pilot-link-0.12.5/libpisock/md5.c.ftbfs-f19 2013-02-25 15:17:31.708780677 +0100 ++++ pilot-link-0.12.5/libpisock/md5.c 2013-02-25 15:15:07.771861922 +0100 +@@ -125,7 +125,7 @@ void MD5Final(UINT8 digest[16], struct M + + byteSwap(ctx->buf, 4); + memcpy(digest, ctx->buf, 16); +- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ ++ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ + } + + #ifndef ASM_MD5 +diff -up pilot-link-0.12.5/popt/popthelp.c.ftbfs-f19 pilot-link-0.12.5/popt/popthelp.c +--- pilot-link-0.12.5/popt/popthelp.c.ftbfs-f19 2004-08-25 17:06:39.000000000 +0200 ++++ pilot-link-0.12.5/popt/popthelp.c 2013-02-25 15:16:34.593606516 +0100 +@@ -683,7 +683,7 @@ static int showShortOptions(const struct + s[0] = '\0'; + /*@-branchstate@*/ /* FIX: W2DO? */ + if (str == NULL) { +- memset(s, 0, sizeof(s)); ++ memset(s, 0, sizeof(*s)); + str = s; + } + /*@=branchstate@*/ diff --git a/source/l/pilot-link/pilot-link-0.12.5-ftbfs-f21.patch b/source/l/pilot-link/pilot-link-0.12.5-ftbfs-f21.patch new file mode 100644 index 000000000..772c68a3a --- /dev/null +++ b/source/l/pilot-link/pilot-link-0.12.5-ftbfs-f21.patch @@ -0,0 +1,22 @@ +diff -ur pilot-link-0.12.5.orig/configure pilot-link-0.12.5/configure +--- pilot-link-0.12.5.orig/configure 2010-02-07 04:42:29.000000000 +0100 ++++ pilot-link-0.12.5/configure 2014-05-09 15:36:30.466127800 +0200 +@@ -2604,12 +2604,12 @@ + + + enable_werror=no +-save_CFLAGS="$CFLAGS" +-CFLAGS=`echo $save_CFLAGS | sed -e s/-Werror//g` +-CXXFLAGS=`echo $save_CXXFLAGS | sed -e s/-Werror//g` +-if test "x$CFLAGS" != "x$save_CFLAGS"; then +- enable_werror="yes" +-fi ++#save_CFLAGS="$CFLAGS" ++#CFLAGS=`echo $save_CFLAGS | sed -e s/-Werror//g` ++#CXXFLAGS=`echo $save_CXXFLAGS | sed -e s/-Werror//g` ++#if test "x$CFLAGS" != "x$save_CFLAGS"; then ++# enable_werror="yes" ++#fi + + + ac_aux_dir= diff --git a/source/l/pilot-link/pilot-link-0.12.5-mp.patch b/source/l/pilot-link/pilot-link-0.12.5-mp.patch new file mode 100644 index 000000000..c2d302615 --- /dev/null +++ b/source/l/pilot-link/pilot-link-0.12.5-mp.patch @@ -0,0 +1,13 @@ +diff -up pilot-link-0.12.5/doc/man/pilot-install-expenses.1.pom pilot-link-0.12.5/doc/man/pilot-install-expenses.1 +--- pilot-link-0.12.5/doc/man/pilot-install-expenses.1.pom 2010-02-07 04:43:11.000000000 +0100 ++++ pilot-link-0.12.5/doc/man/pilot-install-expenses.1 2011-03-09 17:12:30.000000000 +0100 +@@ -76,7 +76,7 @@ Add the number of attendees to the expen + \fB\-\-city\fR \fBSTRING\fR + + .PP +-Add entries to the "City" field in the expense record\&. These are free\-form values, and can be the name of the location, city, or town that the expense record occured in\&. ++Add entries to the "City" field in the expense record\&. These are free\-form values, and can be the name of the location, city, or town that the expense record occurred in\&. + + \fB\-n\fR, + \fB\-\-note\fR \fBSTRING\fR +diff -up pilot-link-0.12.5/doc/man/pilot-install-netsync.1.pom pilot-link-0.12.5/doc/man/pilot-install-netsync.1 diff --git a/source/l/pilot-link/pilot-link-c99.patch b/source/l/pilot-link/pilot-link-c99.patch new file mode 100644 index 000000000..4e69bc866 --- /dev/null +++ b/source/l/pilot-link/pilot-link-c99.patch @@ -0,0 +1,28 @@ +Fix return types for PDA::Pilot::getRecords in the Perl bindings. + +diff --git a/bindings/Perl/Pilot.xs b/bindings/Perl/Pilot.xs +index ef6865b710557fe8..424a24e64df8d2ae 100644 +--- a/bindings/Perl/Pilot.xs ++++ b/bindings/Perl/Pilot.xs +@@ -2542,16 +2542,18 @@ resetNext(self) + OUTPUT: + RETVAL + +-int ++SV * + getRecords(self) + PDA::Pilot::DLP::DB *self + CODE: + { +- int result = dlp_ReadOpenDBInfo(self->socket, self->handle, &RETVAL); ++ int retval; ++ int result = dlp_ReadOpenDBInfo(self->socket, self->handle, &retval); + if (result < 0) { + RETVAL = newSVsv(&PL_sv_undef); + self->errnop = result; +- } ++ } else ++ RETVAL = newSViv(retval); + } + OUTPUT: + RETVAL diff --git a/source/l/pilot-link/pilot-link-configure-c99.patch b/source/l/pilot-link/pilot-link-configure-c99.patch new file mode 100644 index 000000000..7ce8d0eed --- /dev/null +++ b/source/l/pilot-link/pilot-link-configure-c99.patch @@ -0,0 +1,30 @@ +The standard iconv function expects a char ** type for its input +argument. Adjust the configure probe to avoid build failures +with future compilers. + +diff --git a/configure b/configure +index d4031564da7e2184..a2e5877f8588059d 100755 +--- a/configure ++++ b/configure +@@ -15859,7 +15859,7 @@ else + + int main (int argc, char **argv) + { +- const char *pc = "\x66\x66\x66\x66\x66\x66\x66\xA9"; ++ char *pc = (char *) "\x66\x66\x66\x66\x66\x66\x66\xA9"; + const char *utf8 = "\x66\x66\x66\x66\x66\x66\x66\xC2\xA9"; + char transbuf[10], *trans = transbuf; + iconv_t cd; +diff --git a/configure.ac b/configure.ac +index dc19311ce99f888a..ce9b310527e1a8dc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -458,7 +458,7 @@ AC_CHECK_LIB( + + int main (int argc, char **argv) + { +- const char *pc = "\x66\x66\x66\x66\x66\x66\x66\xA9"; ++ char *pc = (char *) "\x66\x66\x66\x66\x66\x66\x66\xA9"; + const char *utf8 = "\x66\x66\x66\x66\x66\x66\x66\xC2\xA9"; + char transbuf[10], *trans = transbuf; + iconv_t cd; diff --git a/source/l/pilot-link/pilot-link.SlackBuild b/source/l/pilot-link/pilot-link.SlackBuild index 80e15ce26..1e149534e 100755 --- a/source/l/pilot-link/pilot-link.SlackBuild +++ b/source/l/pilot-link/pilot-link.SlackBuild @@ -70,8 +70,17 @@ rm -rf pilot-link-$VERSION tar xvf $CWD/pilot-link-$VERSION.tar.bz2 || exit 1 cd pilot-link-$VERSION || exit 1 -zcat $CWD/pilot-link.png14.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/pilot-link-0.12.5-redefinePerlsymbols.patch.gz | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-0.12.1-var.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-0.12.2-open.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-0.12.3-clio.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-0.12.5-mp.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-0.12.5-redefinePerlsymbols.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-0.12.5-compiler_warnings.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-0.12.5-ftbfs-f19.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-0.12.5-aarch64.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-0.12.5-ftbfs-f21.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-configure-c99.patch | patch -p1 --verbose || exit 1 +cat $CWD/pilot-link-c99.patch | patch -p1 --verbose || exit 1 chown -R root:root . find . \ diff --git a/source/l/pilot-link/pilot-link.png14.diff b/source/l/pilot-link/pilot-link.png14.diff deleted file mode 100644 index bc1cba25d..000000000 --- a/source/l/pilot-link/pilot-link.png14.diff +++ /dev/null @@ -1,96 +0,0 @@ ---- ./src/pilot-read-veo.c.orig 2007-02-04 17:06:03.000000000 -0600 -+++ ./src/pilot-read-veo.c 2010-02-19 12:52:30.000000000 -0600 -@@ -41,10 +41,6 @@ - - #ifdef HAVE_PNG - # include "png.h" --# if (PNG_LIBPNG_VER < 10201) --# define png_voidp_NULL (png_voidp)NULL --# define png_error_ptr_NULL (png_error_ptr)NULL --# endif - #endif - - #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4)) -@@ -856,8 +852,8 @@ - png_infop info_ptr; - - png_ptr = png_create_write_struct -- (PNG_LIBPNG_VER_STRING, png_voidp_NULL, -- png_error_ptr_NULL, png_error_ptr_NULL); -+ (PNG_LIBPNG_VER_STRING, NULL, -+ NULL, NULL); - - if (!png_ptr) - return; ---- ./src/pilot-read-notepad.c.orig 2007-02-04 17:06:02.000000000 -0600 -+++ ./src/pilot-read-notepad.c 2010-02-19 12:53:03.000000000 -0600 -@@ -39,10 +39,6 @@ - - #ifdef HAVE_PNG - #include "png.h" --#if (PNG_LIBPNG_VER < 10201) -- #define png_voidp_NULL (png_voidp)NULL -- #define png_error_ptr_NULL (png_error_ptr)NULL --#endif - #endif - - const char *progname; -@@ -166,8 +162,8 @@ - width = n->body.width + 8; - - png_ptr = png_create_write_struct -- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL, -- png_error_ptr_NULL, png_error_ptr_NULL); -+ ( PNG_LIBPNG_VER_STRING, NULL, -+ NULL, NULL); - - if(!png_ptr) - return; ---- ./src/pilot-read-screenshot.c.orig 2006-11-02 08:54:31.000000000 -0600 -+++ ./src/pilot-read-screenshot.c 2010-02-19 12:50:44.000000000 -0600 -@@ -40,10 +40,6 @@ - - #ifdef HAVE_PNG - # include "png.h" --# if (PNG_LIBPNG_VER < 10201) --# define png_voidp_NULL (png_voidp)NULL --# define png_error_ptr_NULL (png_error_ptr)NULL --# endif - #endif - - #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4)) -@@ -87,8 +83,8 @@ - gray_buf = malloc( state->w ); - - png_ptr = png_create_write_struct -- (PNG_LIBPNG_VER_STRING, png_voidp_NULL, -- png_error_ptr_NULL, png_error_ptr_NULL); -+ (PNG_LIBPNG_VER_STRING, NULL, -+ NULL, NULL); - - if (!png_ptr) - return; ---- ./src/pilot-read-palmpix.c.orig 2007-02-04 17:06:03.000000000 -0600 -+++ ./src/pilot-read-palmpix.c 2010-02-19 12:51:10.000000000 -0600 -@@ -42,10 +42,6 @@ - - #ifdef HAVE_PNG - #include "png.h" --#if (PNG_LIBPNG_VER < 10201) -- #define png_voidp_NULL (png_voidp)NULL -- #define png_error_ptr_NULL (png_error_ptr)NULL --#endif - #endif - - const char *progname; -@@ -223,8 +219,8 @@ - png_infop info_ptr; - - png_ptr = png_create_write_struct -- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL, -- png_error_ptr_NULL, png_error_ptr_NULL); -+ ( PNG_LIBPNG_VER_STRING, NULL, -+ NULL, NULL); - - if(!png_ptr) - return; diff --git a/source/l/pipewire/pipewire.SlackBuild b/source/l/pipewire/pipewire.SlackBuild index 79f1988d9..024559f09 100755 --- a/source/l/pipewire/pipewire.SlackBuild +++ b/source/l/pipewire/pipewire.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -48,21 +48,12 @@ fi NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -103,6 +94,7 @@ cd meson-build --sysconfdir=/etc \ --localstatedir=/var \ --buildtype=release \ + -Dudevrulesdir=/lib/udev/rules.d \ -Dman=enabled \ -Dffmpeg=enabled \ -Dvulkan=enabled \ diff --git a/source/l/pipewire/pipewire.url b/source/l/pipewire/pipewire.url index c9f6477ee..04ebedaf3 100644 --- a/source/l/pipewire/pipewire.url +++ b/source/l/pipewire/pipewire.url @@ -1 +1,2 @@ https://gitlab.freedesktop.org/pipewire/pipewire +https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/1.2.4/pipewire-1.2.4.tar.gz diff --git a/source/l/polkit/polkit.SlackBuild b/source/l/polkit/polkit.SlackBuild index 293a05dcd..7cb04f862 100755 --- a/source/l/polkit/polkit.SlackBuild +++ b/source/l/polkit/polkit.SlackBuild @@ -26,12 +26,12 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=polkit VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -51,14 +51,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -82,13 +79,6 @@ find . \ zcat $CWD/dont-set-wheel-group-as-admin.diff.gz | patch -p1 --verbose || exit 1 -# If we get here and don't have a polkitd user/group, add one. -# Otherwise a few directories in the package will have wrong permissions. -if ! grep -q "^polkitd:" /etc/passwd ; then - groupadd -fg 87 polkitd - useradd -c "PolicyKit daemon owner" -d /var/lib/polkit -u 87 -g polkitd -s /bin/false polkitd -fi - # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" @@ -107,10 +97,11 @@ meson setup \ --localstatedir=/var \ --buildtype=release \ -Dintrospection=true \ - -Dsession_tracking=libelogind \ + -Dsession_tracking=elogind \ -Dsystemdsystemunitdir=/usr/lib/systemd/user \ -Dauthfw=pam \ -Dpam_module_dir=/lib${LIBDIRSUFFIX}/security \ + -Dpam_prefix=/etc/pam.d \ -Dman=true \ -Djs_engine=duktape \ .. || exit 1 diff --git a/source/l/poppler/poppler.SlackBuild b/source/l/poppler/poppler.SlackBuild index 81a5ba020..574133915 100755 --- a/source/l/poppler/poppler.SlackBuild +++ b/source/l/poppler/poppler.SlackBuild @@ -30,7 +30,7 @@ QT6OPT=${QT6OPT:--DENABLE_QT6=ON} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -47,14 +47,11 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -98,7 +95,7 @@ cmake \ $QT6OPT \ .. || exit 1 -make $NUMJOBS || make || exit 1 +make $NUMJOBS || exit 1 make install DESTDIR=$PKG || exit 1 # Back to source tarball root directory: diff --git a/source/l/protobuf/protobuf.SlackBuild b/source/l/protobuf/protobuf.SlackBuild index fb799d078..dede4efcf 100755 --- a/source/l/protobuf/protobuf.SlackBuild +++ b/source/l/protobuf/protobuf.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -47,21 +47,12 @@ fi NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -105,13 +96,26 @@ cd cmake-build make install DESTDIR=$PKG || exit 1 cd .. -# Install the python bindings: -cd python -cp -a dist/setup.py . +# Don't use the python bindings included in the main tarball, as they are +# incomplete without further processing. Use the ones fetched from +# https://pypi.python.org/pypi/protobuf that are ready to go: +PYBINDING=${PYBINDING:-$(echo $CWD/python-protobuf/protobuf-*.tar.?z | rev | cut -f 1 -d - | cut -f 3- -d . | rev)} +tar xf $CWD/python-protobuf/protobuf-${PYBINDING}.tar.?z || exit 1 +cd protobuf-${PYBINDING} +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 {} \+ LDFLAGS+=" -L$TMP/$PKGNAM-$VERSION/build" \ PROTOC="$TMP/$PKGNAM-$VERSION/build/protoc" \ python3 -m build --wheel --no-isolation python3 -m installer --destdir "$PKG" dist/*.whl +mkdir -p $PKG/usr/doc/python-protobuf-${PYBINDING} +cp -a \ + *.md *.rst *.txt LICENSE PKG-INFO \ + $PKG/usr/doc/python-protobuf-${PYBINDING} cd .. # Strip binaries: diff --git a/source/l/protobuf/python-protobuf/protobuf.url b/source/l/protobuf/python-protobuf/protobuf.url new file mode 100644 index 000000000..56c2c3337 --- /dev/null +++ b/source/l/protobuf/python-protobuf/protobuf.url @@ -0,0 +1 @@ +https://pypi.python.org/pypi/protobuf diff --git a/source/l/pulseaudio/pulseaudio.SlackBuild b/source/l/pulseaudio/pulseaudio.SlackBuild index 3e9b1b4b6..b019b5a7a 100755 --- a/source/l/pulseaudio/pulseaudio.SlackBuild +++ b/source/l/pulseaudio/pulseaudio.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pulseaudio VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -146,6 +146,9 @@ cp $CWD/rc.pulseaudio $PKG/etc/rc.d/rc.pulseaudio.new chmod 644 $PKG/etc/rc.d/rc.pulseaudio.new chown root:root $PKG/etc/rc.d/rc.pulseaudio.new +# PA warns in the logs if these directories are missing: +mkdir -p $PKG/etc/pulse/{default,system}.pa.d + # Compress and link manpages: 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/source/l/pycairo/pycairo.SlackBuild b/source/l/pycairo/pycairo.SlackBuild index bcd47b7fd..18c016c6f 100755 --- a/source/l/pycairo/pycairo.SlackBuild +++ b/source/l/pycairo/pycairo.SlackBuild @@ -27,13 +27,13 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pycairo VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -47,17 +47,11 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then 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" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/pycairo/pycairo.url b/source/l/pycairo/pycairo.url index 2733937d0..d7043835b 100644 --- a/source/l/pycairo/pycairo.url +++ b/source/l/pycairo/pycairo.url @@ -1,2 +1,3 @@ +https://github.com/pygobject/pycairo/releases/download/v1.27.0/pycairo-1.27.0.tar.gz https://pycairo.readthedocs.io/en/latest/ https://github.com/pygobject/pycairo/releases diff --git a/source/l/pycups/pycups.SlackBuild b/source/l/pycups/pycups.SlackBuild index 96ee044f7..2baa7c19c 100755 --- a/source/l/pycups/pycups.SlackBuild +++ b/source/l/pycups/pycups.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2008 Heinz Wiesinger, Oggau, AT -# Copyright 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2018, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pycups VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-6} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -65,8 +65,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -python3 setup.py install --root=$PKG || exit 1 -make install-rpmhook DESTDIR=$PKG || exit 1 +make || exit 1 +make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "shared object" -e "executable" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -87,4 +87,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/l/pycurl/pycurl.SlackBuild b/source/l/pycurl/pycurl.SlackBuild index 997533003..80bc818a8 100755 --- a/source/l/pycurl/pycurl.SlackBuild +++ b/source/l/pycurl/pycurl.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pycurl VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/pygobject/pygobject.SlackBuild b/source/l/pygobject/pygobject.SlackBuild index 0d2b697cf..5a35d48ab 100755 --- a/source/l/pygobject/pygobject.SlackBuild +++ b/source/l/pygobject/pygobject.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pygobject VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-9} +BUILD=${BUILD:-10} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -97,6 +97,7 @@ find . \ #make clean CFLAGS="$SLKCFLAGS" \ +PYTHON=python2 \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/source/l/pygobject/slack-desc b/source/l/pygobject/slack-desc index b11f12ed0..475952bfd 100644 --- a/source/l/pygobject/slack-desc +++ b/source/l/pygobject/slack-desc @@ -12,7 +12,7 @@ pygobject: This archive contains bindings for the GObject, to be used in Python. pygobject: It is a fairly complete set of bindings, it's already rather useful, pygobject: and is usable to write moderately complex programs. pygobject: -pygobject: pygobject's home page: http://www.pygtk.org/ +pygobject: Homepage: https://pygobject.readthedocs.io pygobject: pygobject: pygobject: diff --git a/source/l/pygobject3/pygobject3.SlackBuild b/source/l/pygobject3/pygobject3.SlackBuild index cb4ceab76..880363ec5 100755 --- a/source/l/pygobject3/pygobject3.SlackBuild +++ b/source/l/pygobject3/pygobject3.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -49,14 +49,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/pygobject3/slack-desc b/source/l/pygobject3/slack-desc index e573345cc..6d9a5bd45 100644 --- a/source/l/pygobject3/slack-desc +++ b/source/l/pygobject3/slack-desc @@ -12,7 +12,7 @@ pygobject3: This archive contains bindings for the GObject, to be used in Python pygobject3: It is a fairly complete set of bindings, it's already rather useful, pygobject3: and is usable to write moderately complex programs. pygobject3: -pygobject3: Homepage: https://live.gnome.org/PyGObject +pygobject3: Homepage: https://pygobject.readthedocs.io pygobject3: pygobject3: pygobject3: diff --git a/source/l/pygtk/pygtk.SlackBuild b/source/l/pygtk/pygtk.SlackBuild index c25f4c588..3c1657dc8 100755 --- a/source/l/pygtk/pygtk.SlackBuild +++ b/source/l/pygtk/pygtk.SlackBuild @@ -67,6 +67,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration -Wno-error=int-conversion" + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP || exit 1 @@ -86,6 +89,7 @@ zcat $CWD/pygtk-fix-pango-object-leaks.patch.gz | patch -p1 --verbose || exit 1 # Fix build against recent pango: zcat $CWD/pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch.gz | patch -p1 --verbose || exit 1 +PYTHON=python2 \ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/l/pyparsing/pyparsing.SlackBuild b/source/l/pyparsing/pyparsing.SlackBuild index 3f237e787..f10e71dcb 100755 --- a/source/l/pyparsing/pyparsing.SlackBuild +++ b/source/l/pyparsing/pyparsing.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pyparsing VERSION=${VERSION:-$(echo pyparsing-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-Jinja2/Jinja2.url b/source/l/python-Jinja2/jinja2.url index f978be6b1..f978be6b1 100644 --- a/source/l/python-Jinja2/Jinja2.url +++ b/source/l/python-Jinja2/jinja2.url diff --git a/source/l/python-Jinja2/python-Jinja2.SlackBuild b/source/l/python-Jinja2/python-Jinja2.SlackBuild index e3e7cf1ab..1dcf52dfe 100755 --- a/source/l/python-Jinja2/python-Jinja2.SlackBuild +++ b/source/l/python-Jinja2/python-Jinja2.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-Jinja2 -SRCNAM=Jinja2 +SRCNAM=jinja2 VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} diff --git a/source/l/python-MarkupSafe/python-MarkupSafe.SlackBuild b/source/l/python-MarkupSafe/python-MarkupSafe.SlackBuild index e532679ff..2751b3dc1 100755 --- a/source/l/python-MarkupSafe/python-MarkupSafe.SlackBuild +++ b/source/l/python-MarkupSafe/python-MarkupSafe.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-MarkupSafe SRCNAM=MarkupSafe VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-PyYAML/cython3.compat.patch b/source/l/python-PyYAML/cython3.compat.patch deleted file mode 100644 index 4c924f496..000000000 --- a/source/l/python-PyYAML/cython3.compat.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 17dc5b6cd96dcfe64fd71789c771ca9b96d260e5 Mon Sep 17 00:00:00 2001 -From: "Andrew J. Hesford" <ajh@sideband.org> -Date: Fri, 21 Jul 2023 09:50:00 -0400 -Subject: [PATCH] Fix builds with Cython 3 - -This is a *de minimis* fix for building with Cython 3. Recent Cython<3 -releases provided `Cython.Distutils.build_ext` as an alias to -`Cython.Distutils.old_build_ext.old_build_ext`; Cython 3 drops this -alias and instead uses a wholly new `Cython.Distutils.build_ext` that -does not provide the `cython_sources` function used in `setup.py`. - -Explicitly importing `old_build_ext` preserves the existing behavior for -recent Cython<3 and uses the correct behavior for Cython 3. Should the -import fail (*e.g.*, because the version of Cython available predates -the availability of `old_build_ext`), the import falls back to just -`Cython.Distutils.build_ext`. - -Signed-off-by: Andrew J. Hesford <ajh@sideband.org> ---- - setup.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 944e7fa2..462b1e95 100644 ---- a/setup.py -+++ b/setup.py -@@ -82,7 +82,11 @@ - with_cython = True - try: - from Cython.Distutils.extension import Extension as _Extension -- from Cython.Distutils import build_ext as _build_ext -+ try: -+ from Cython.Distutils.old_build_ext import old_build_ext as _build_ext -+ except ImportError: -+ from Cython.Distutils import build_ext as _build_ext -+ - with_cython = True - except ImportError: - if with_cython: diff --git a/source/l/python-PyYAML/pyproject.toml.cython3.patch b/source/l/python-PyYAML/pyproject.toml.cython3.patch deleted file mode 100644 index d8578d859..000000000 --- a/source/l/python-PyYAML/pyproject.toml.cython3.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- ./pyproject.toml.orig 2023-07-17 18:39:53.000000000 -0500 -+++ ./pyproject.toml 2024-03-03 13:11:48.147039844 -0600 -@@ -1,3 +1,3 @@ - [build-system] --requires = ["setuptools", "wheel", "Cython<3.0"] -+requires = ["setuptools", "wheel", "Cython"] - build-backend = "setuptools.build_meta" diff --git a/source/l/python-PyYAML/python-PyYAML.SlackBuild b/source/l/python-PyYAML/python-PyYAML.SlackBuild index 5ffae5ad2..0a2755a01 100755 --- a/source/l/python-PyYAML/python-PyYAML.SlackBuild +++ b/source/l/python-PyYAML/python-PyYAML.SlackBuild @@ -23,13 +23,13 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-PyYAML -SRCNAM=PyYAML +SRCNAM=pyyaml VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -53,10 +53,6 @@ rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 cd $SRCNAM-$VERSION || exit 1 -# Fix build with Cython >= 3: -cat $CWD/cython3.compat.patch | patch -p1 --verbose || exit 1 -cat $CWD/pyproject.toml.cython3.patch | patch -p1 --verbose || exit 1 - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/source/l/python-PyYAML/PyYAML.url b/source/l/python-PyYAML/pyyaml.url index 3d890b904..3d890b904 100644 --- a/source/l/python-PyYAML/PyYAML.url +++ b/source/l/python-PyYAML/pyyaml.url diff --git a/source/l/python-alabaster/python-alabaster.SlackBuild b/source/l/python-alabaster/python-alabaster.SlackBuild index 97ec4dfe2..d32b73fa7 100755 --- a/source/l/python-alabaster/python-alabaster.SlackBuild +++ b/source/l/python-alabaster/python-alabaster.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac diff --git a/source/l/python-appdirs/python-appdirs.SlackBuild b/source/l/python-appdirs/python-appdirs.SlackBuild index 56075476a..5b193f716 100755 --- a/source/l/python-appdirs/python-appdirs.SlackBuild +++ b/source/l/python-appdirs/python-appdirs.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-appdirs VERSION=${VERSION:-$(echo appdirs-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-6} +BUILD=${BUILD:-7} SRCNAM=appdirs diff --git a/source/l/python-babel/Babel.url b/source/l/python-babel/babel.url index a0bee683f..a0bee683f 100644 --- a/source/l/python-babel/Babel.url +++ b/source/l/python-babel/babel.url diff --git a/source/l/python-babel/python-babel.SlackBuild b/source/l/python-babel/python-babel.SlackBuild index 70067f3e2..64d4d99bb 100755 --- a/source/l/python-babel/python-babel.SlackBuild +++ b/source/l/python-babel/python-babel.SlackBuild @@ -23,13 +23,13 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-babel -SRCNAM=Babel +SRCNAM=babel VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac diff --git a/source/l/python-build/python-build.SlackBuild b/source/l/python-build/python-build.SlackBuild index 73cd16648..3c7b3c713 100755 --- a/source/l/python-build/python-build.SlackBuild +++ b/source/l/python-build/python-build.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -44,18 +44,15 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -if [ "${ARCH}" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then +if [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi TMP=${TMP:-/tmp} diff --git a/source/l/python-calver/python-calver.SlackBuild b/source/l/python-calver/python-calver.SlackBuild index 0d9023538..d71e153bc 100755 --- a/source/l/python-calver/python-calver.SlackBuild +++ b/source/l/python-calver/python-calver.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-calver SRCNAM=calver VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/python-certifi/python-certifi.SlackBuild b/source/l/python-certifi/python-certifi.SlackBuild index a104dbc93..a06770ddf 100755 --- a/source/l/python-certifi/python-certifi.SlackBuild +++ b/source/l/python-certifi/python-certifi.SlackBuild @@ -31,7 +31,7 @@ SRCNAM=certifi if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac diff --git a/source/l/python-cffi/python-cffi.SlackBuild b/source/l/python-cffi/python-cffi.SlackBuild index 42891abf8..c1c6b2137 100755 --- a/source/l/python-cffi/python-cffi.SlackBuild +++ b/source/l/python-cffi/python-cffi.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac diff --git a/source/l/python-chardet/python-chardet.SlackBuild b/source/l/python-chardet/python-chardet.SlackBuild index 4e81f5418..50380c201 100755 --- a/source/l/python-chardet/python-chardet.SlackBuild +++ b/source/l/python-chardet/python-chardet.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-chardet VERSION=${VERSION:-$(echo chardet-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} SRCNAM=chardet diff --git a/source/l/python-charset-normalizer/python-charset-normalizer.SlackBuild b/source/l/python-charset-normalizer/python-charset-normalizer.SlackBuild index 2c5bdd99a..9a177fabc 100755 --- a/source/l/python-charset-normalizer/python-charset-normalizer.SlackBuild +++ b/source/l/python-charset-normalizer/python-charset-normalizer.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-charset-normalizer SRCNAM=charset-normalizer VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-distro/python-distro.SlackBuild b/source/l/python-distro/python-distro.SlackBuild index f23996493..45f7780dc 100755 --- a/source/l/python-distro/python-distro.SlackBuild +++ b/source/l/python-distro/python-distro.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-distro SRCNAM=distro VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-dnspython/python-dnspython.SlackBuild b/source/l/python-dnspython/python-dnspython.SlackBuild index f8b1ee165..9621d9988 100755 --- a/source/l/python-dnspython/python-dnspython.SlackBuild +++ b/source/l/python-dnspython/python-dnspython.SlackBuild @@ -35,7 +35,7 @@ fi PKGNAM=python-dnspython SRCNAM=dnspython VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-docutils/python-docutils.SlackBuild b/source/l/python-docutils/python-docutils.SlackBuild index 3dd51412b..62361b74d 100755 --- a/source/l/python-docutils/python-docutils.SlackBuild +++ b/source/l/python-docutils/python-docutils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2017, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2017, 2018, 2019, 2020, 2024 Patrick J. Volkerding, Sebeka, MN, USA # Copyright 2017 Heinz Wiesinger, Amsterdam, NL # All rights reserved. # @@ -61,11 +61,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 {} \+ -python3 setup.py build --build-lib=build/python3 install --root=$PKG || exit 1 +unshare -n python3 -m build --wheel --no-isolation || exit 1 +python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 + +# Gotta be careful with that * cd $PKG/usr/bin for i in *.py; do - ln -s "$i" "$PKG/usr/bin/$(basename $i .py)" + if [ -r "$i" ]; then + ln -s "$i" "$PKG/usr/bin/$(basename $i .py)" + fi done cd - diff --git a/source/l/python-doxypypy/python-doxypypy.SlackBuild b/source/l/python-doxypypy/python-doxypypy.SlackBuild index c447fa8d7..0b8c22fa4 100755 --- a/source/l/python-doxypypy/python-doxypypy.SlackBuild +++ b/source/l/python-doxypypy/python-doxypypy.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-doxypypy SRCNAM=doxypypy VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-doxyqml/python-doxyqml.SlackBuild b/source/l/python-doxyqml/python-doxyqml.SlackBuild index 5e71d5bf3..7a82458ef 100755 --- a/source/l/python-doxyqml/python-doxyqml.SlackBuild +++ b/source/l/python-doxyqml/python-doxyqml.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-doxyqml SRCNAM=doxyqml VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-editables/python-editables.SlackBuild b/source/l/python-editables/python-editables.SlackBuild index 4c411fddc..11c1517d4 100755 --- a/source/l/python-editables/python-editables.SlackBuild +++ b/source/l/python-editables/python-editables.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-editables VERSION=${VERSION:-$(echo editables-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/python-flit-core/python-flit-core.SlackBuild b/source/l/python-flit-core/python-flit-core.SlackBuild index 075bfca06..cafd7fac6 100755 --- a/source/l/python-flit-core/python-flit-core.SlackBuild +++ b/source/l/python-flit-core/python-flit-core.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-flit-core VERSION=${VERSION:-$(echo flit_core-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/python-future/python-future.SlackBuild b/source/l/python-future/python-future.SlackBuild index 00e1f5959..c3bd2537b 100755 --- a/source/l/python-future/python-future.SlackBuild +++ b/source/l/python-future/python-future.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-future SRCNAM=future VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-glad2/python-glad2.SlackBuild b/source/l/python-glad2/python-glad2.SlackBuild index 5a5916f82..362355acd 100755 --- a/source/l/python-glad2/python-glad2.SlackBuild +++ b/source/l/python-glad2/python-glad2.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -45,17 +45,14 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then 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" = "s390" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi TMP=${TMP:-/tmp} diff --git a/source/l/python-hatch-vcs/hatch-vcs.url b/source/l/python-hatch-vcs/hatch-vcs.url new file mode 100644 index 000000000..a5590ed89 --- /dev/null +++ b/source/l/python-hatch-vcs/hatch-vcs.url @@ -0,0 +1 @@ +https://github.com/ofek/hatch-vcs diff --git a/source/l/python-typing_extensions/python-typing_extensions.SlackBuild b/source/l/python-hatch-vcs/python-hatch-vcs.SlackBuild index a782e9c7d..39015e2fc 100755 --- a/source/l/python-typing_extensions/python-typing_extensions.SlackBuild +++ b/source/l/python-hatch-vcs/python-hatch-vcs.SlackBuild @@ -1,6 +1,7 @@ #!/bin/bash -# Copyright 2024 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2017, 2018, 2024 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2017 Heinz Wiesinger, Amsterdam, NL # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,14 +23,15 @@ cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=python-typing_extensions -SRCNAM=typing_extensions -VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +PKGNAM=python-hatch-vcs +VERSION=${VERSION:-$(echo hatch-vcs-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +SRCNAM=hatch-vcs + if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -52,7 +54,6 @@ cd $TMP rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 cd $SRCNAM-$VERSION || exit 1 - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -65,16 +66,16 @@ unshare -n python3 -m build --wheel --no-isolation || exit 1 python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a *.rst LICENSE* NOTICE PKG-INFO README* \ +cp -a *.rst *.txt PKG-INFO \ $PKG/usr/doc/$PKGNAM-$VERSION find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \+ -# If there's a HISTORY.rst, installing at least part of the recent history +# If there's a CHANGES.rst, installing at least part of the recent history # is useful, but don't let it get totally out of control: -if [ -r HISTORY.rst ]; then +if [ -r CHANGES.rst ]; then DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) - cat HISTORY.rst | head -n 1000 > $DOCSDIR/HISTORY.rst - touch -r HISTORY.rst $DOCSDIR/HISTORY.rst + cat CHANGES.rst | head -n 1000 > $DOCSDIR/CHANGES.rst + touch -r CHANGES.rst $DOCSDIR/CHANGES.rst fi mkdir -p $PKG/install diff --git a/source/l/python-hatch-vcs/slack-desc b/source/l/python-hatch-vcs/slack-desc new file mode 100644 index 000000000..e76a748f9 --- /dev/null +++ b/source/l/python-hatch-vcs/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------------------------------------------------------| +python-hatch-vcs: python-hatch-vcs (hatch versioning plugin) +python-hatch-vcs: +python-hatch-vcs: This package provides a plugin for hatch that uses your preferred +python-hatch-vcs: version control system (like Git) to determine project versions. +python-hatch-vcs: +python-hatch-vcs: Homepage: https://github.com/ofek/hatch-vcs +python-hatch-vcs: +python-hatch-vcs: +python-hatch-vcs: +python-hatch-vcs: +python-hatch-vcs: diff --git a/source/l/python-html5lib/python-html5lib.SlackBuild b/source/l/python-html5lib/python-html5lib.SlackBuild index 426771de6..8cc1be1ed 100755 --- a/source/l/python-html5lib/python-html5lib.SlackBuild +++ b/source/l/python-html5lib/python-html5lib.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-html5lib SRCNAM=html5lib-python VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-idna/python-idna.SlackBuild b/source/l/python-idna/python-idna.SlackBuild index dc7b695cd..5baacdfa3 100755 --- a/source/l/python-idna/python-idna.SlackBuild +++ b/source/l/python-idna/python-idna.SlackBuild @@ -31,7 +31,7 @@ SRCNAM=idna if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac diff --git a/source/l/python-imagesize/python-imagesize.SlackBuild b/source/l/python-imagesize/python-imagesize.SlackBuild index e341f0ac2..73b33260d 100755 --- a/source/l/python-imagesize/python-imagesize.SlackBuild +++ b/source/l/python-imagesize/python-imagesize.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-imagesize SRCNAM=imagesize VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-importlib_metadata/python-importlib_metadata.SlackBuild b/source/l/python-importlib_metadata/python-importlib_metadata.SlackBuild index 3e9159842..19be8355f 100755 --- a/source/l/python-importlib_metadata/python-importlib_metadata.SlackBuild +++ b/source/l/python-importlib_metadata/python-importlib_metadata.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac diff --git a/source/l/python-installer/python-installer.SlackBuild b/source/l/python-installer/python-installer.SlackBuild index 71265004b..d9e9bce66 100755 --- a/source/l/python-installer/python-installer.SlackBuild +++ b/source/l/python-installer/python-installer.SlackBuild @@ -1,6 +1,7 @@ #!/bin/bash # Copyright 2022-2023 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-installer VERSION=${VERSION:-$(echo installer-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -83,6 +84,10 @@ PYTHONPATH=src python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# Remove Windows garbage: +find $PKG . -name "*.exe" -exec rm -f "{}" \; +find $PKG . -name "*.dll" -exec rm -f "{}" \; + mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ *.md *.rst LICENSE PKG-INFO \ diff --git a/source/l/python-lxml/python-lxml.SlackBuild b/source/l/python-lxml/python-lxml.SlackBuild index 3e51e4aab..5b5a50a27 100755 --- a/source/l/python-lxml/python-lxml.SlackBuild +++ b/source/l/python-lxml/python-lxml.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -45,18 +45,15 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -if [ "${ARCH}" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then +if [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi TMP=${TMP:-/tmp} diff --git a/source/l/python-markdown/Markdown.url b/source/l/python-markdown/Markdown.url deleted file mode 100644 index 5d8376674..000000000 --- a/source/l/python-markdown/Markdown.url +++ /dev/null @@ -1 +0,0 @@ -https://pypi.org/project/Markdown diff --git a/source/l/python-markdown/markdown.url b/source/l/python-markdown/markdown.url new file mode 100644 index 000000000..78e779474 --- /dev/null +++ b/source/l/python-markdown/markdown.url @@ -0,0 +1 @@ +https://pypi.org/project/markdown diff --git a/source/l/python-markdown/python-markdown.SlackBuild b/source/l/python-markdown/python-markdown.SlackBuild index 2ecb472e7..155a764a7 100755 --- a/source/l/python-markdown/python-markdown.SlackBuild +++ b/source/l/python-markdown/python-markdown.SlackBuild @@ -23,13 +23,13 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-markdown -SRCNAM=Markdown +SRCNAM=markdown VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac diff --git a/source/l/python-notify2/python-notify2.SlackBuild b/source/l/python-notify2/python-notify2.SlackBuild index 93563fb88..f594fe44e 100755 --- a/source/l/python-notify2/python-notify2.SlackBuild +++ b/source/l/python-notify2/python-notify2.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-notify2 VERSION=${VERSION:-$(echo notify2-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-10} +BUILD=${BUILD:-11} SRCNAM=notify2 diff --git a/source/l/python-pathspec/python-pathspec.SlackBuild b/source/l/python-pathspec/python-pathspec.SlackBuild index 8a71ee65f..deb1ffb4e 100755 --- a/source/l/python-pathspec/python-pathspec.SlackBuild +++ b/source/l/python-pathspec/python-pathspec.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-pathspec VERSION=${VERSION:-$(echo pathspec-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/python-pbr/python-pbr.SlackBuild b/source/l/python-pbr/python-pbr.SlackBuild index d35b261f8..cb1fc5b8f 100755 --- a/source/l/python-pbr/python-pbr.SlackBuild +++ b/source/l/python-pbr/python-pbr.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac diff --git a/source/l/python-ply/python-ply.SlackBuild b/source/l/python-ply/python-ply.SlackBuild index 9e8a5c325..0105a6cfd 100755 --- a/source/l/python-ply/python-ply.SlackBuild +++ b/source/l/python-ply/python-ply.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-ply SRCNAM=ply VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-8} +BUILD=${BUILD:-9} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-pysol_cards/python-pysol_cards.SlackBuild b/source/l/python-pysol_cards/python-pysol_cards.SlackBuild index d4d426530..e377e6cb7 100755 --- a/source/l/python-pysol_cards/python-pysol_cards.SlackBuild +++ b/source/l/python-pysol_cards/python-pysol_cards.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac diff --git a/source/l/python-pytz/python-pytz.SlackBuild b/source/l/python-pytz/python-pytz.SlackBuild deleted file mode 100755 index 9e9c0a496..000000000 --- a/source/l/python-pytz/python-pytz.SlackBuild +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash - -# Copyright 2022, 2024 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) - -PKGNAM=python-pytz -SRCNAM=pytz -VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} - -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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 -cd $SRCNAM-$VERSION || exit 1 - -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 {} \+ - -unshare -n python3 -m build --wheel --no-isolation || exit 1 - -python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a *.rst LICENSE* NOTICE PKG-INFO \ - $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \+ - -# If there's a HISTORY.rst, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r HISTORY.rst ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) - cat HISTORY.rst | head -n 1000 > $DOCSDIR/HISTORY.rst - touch -r 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 $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/python-pytz/pytz.url b/source/l/python-pytz/pytz.url deleted file mode 100644 index efd8c533c..000000000 --- a/source/l/python-pytz/pytz.url +++ /dev/null @@ -1 +0,0 @@ -https://pypi.org/project/pytz diff --git a/source/l/python-pytz/slack-desc b/source/l/python-pytz/slack-desc deleted file mode 100644 index 919badd83..000000000 --- a/source/l/python-pytz/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-pytz: python-pytz (Timezone Definitions for Python) -python-pytz: -python-pytz: pytz brings the Olson tz database into Python. This library allows -python-pytz: accurate and cross platform timezone calculations. It also solves the -python-pytz: issue of ambiguous times at the end of daylight saving time. -python-pytz: -python-pytz: Homepage: http://pythonhosted.org/pytz -python-pytz: -python-pytz: -python-pytz: -python-pytz: diff --git a/source/l/python-random2/python-random2.SlackBuild b/source/l/python-random2/python-random2.SlackBuild index 5ad421eea..a291d834e 100755 --- a/source/l/python-random2/python-random2.SlackBuild +++ b/source/l/python-random2/python-random2.SlackBuild @@ -36,7 +36,7 @@ fi PKGNAM=python-random2 SRCNAM=random2 VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-sane/python-sane.SlackBuild b/source/l/python-sane/python-sane.SlackBuild index 851c90cb2..f81da345e 100755 --- a/source/l/python-sane/python-sane.SlackBuild +++ b/source/l/python-sane/python-sane.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-sane VERSION=${VERSION:-$(echo Sane-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/python-setuptools_scm/python-setuptools_scm.SlackBuild b/source/l/python-setuptools_scm/python-setuptools_scm.SlackBuild index 88ab41d12..5e694846b 100755 --- a/source/l/python-setuptools_scm/python-setuptools_scm.SlackBuild +++ b/source/l/python-setuptools_scm/python-setuptools_scm.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-setuptools_scm -SRCNAM=setuptools-scm +SRCNAM=setuptools_scm VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} diff --git a/source/l/python-setuptools_scm/setuptools-scm.url b/source/l/python-setuptools_scm/setuptools_scm.url index 71af39a71..71af39a71 100644 --- a/source/l/python-setuptools_scm/setuptools-scm.url +++ b/source/l/python-setuptools_scm/setuptools_scm.url diff --git a/source/l/python-six/python-six.SlackBuild b/source/l/python-six/python-six.SlackBuild index f1a8bd263..0403e81e2 100755 --- a/source/l/python-six/python-six.SlackBuild +++ b/source/l/python-six/python-six.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-six VERSION=${VERSION:-$(echo six-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/python-smartypants/python-smartypants.SlackBuild b/source/l/python-smartypants/python-smartypants.SlackBuild index ddda2e3bb..78dfc16bf 100755 --- a/source/l/python-smartypants/python-smartypants.SlackBuild +++ b/source/l/python-smartypants/python-smartypants.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-smartypants VERSION=${VERSION:-$(echo smartypants.py-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/python-snowballstemmer/python-snowballstemmer.SlackBuild b/source/l/python-snowballstemmer/python-snowballstemmer.SlackBuild index 76c38de01..68b396dcd 100755 --- a/source/l/python-snowballstemmer/python-snowballstemmer.SlackBuild +++ b/source/l/python-snowballstemmer/python-snowballstemmer.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-snowballstemmer SRCNAM=snowballstemmer VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-sphinx/python-sphinx.SlackBuild b/source/l/python-sphinx/python-sphinx.SlackBuild index 9a9ffd296..81a31b455 100755 --- a/source/l/python-sphinx/python-sphinx.SlackBuild +++ b/source/l/python-sphinx/python-sphinx.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac diff --git a/source/l/python-sphinx_rtd_theme/python-sphinx_rtd_theme.SlackBuild b/source/l/python-sphinx_rtd_theme/python-sphinx_rtd_theme.SlackBuild index a1d673180..221cfe2d7 100755 --- a/source/l/python-sphinx_rtd_theme/python-sphinx_rtd_theme.SlackBuild +++ b/source/l/python-sphinx_rtd_theme/python-sphinx_rtd_theme.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-sphinx_rtd_theme SRCNAM=sphinx_rtd_theme VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-tomli-w/python-tomli-w.SlackBuild b/source/l/python-tomli-w/python-tomli-w.SlackBuild index 43613e345..212f842e6 100755 --- a/source/l/python-tomli-w/python-tomli-w.SlackBuild +++ b/source/l/python-tomli-w/python-tomli-w.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-tomli-w VERSION=${VERSION:-$(echo tomli_w-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/python-tomli/python-tomli.SlackBuild b/source/l/python-tomli/python-tomli.SlackBuild deleted file mode 100755 index a77948ede..000000000 --- a/source/l/python-tomli/python-tomli.SlackBuild +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -# Copyright 2021 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2021 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) - -PKGNAM=python-tomli -SRCNAM=tomli -VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} - -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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 -cd $SRCNAM-$VERSION || exit 1 - -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 {} \+ - -unshare -n python3 -m build --wheel --no-isolation || exit 1 - -python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a *.rst LICENSE* NOTICE PKG-INFO README* \ - $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \+ - -# If there's a HISTORY.rst, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r HISTORY.rst ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) - cat HISTORY.rst | head -n 1000 > $DOCSDIR/HISTORY.rst - touch -r 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 $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/python-tomli/tomli.url b/source/l/python-tomli/tomli.url deleted file mode 100644 index 22bfedf76..000000000 --- a/source/l/python-tomli/tomli.url +++ /dev/null @@ -1 +0,0 @@ -https://pypi.org/project/tomli diff --git a/source/l/python-trove-classifiers/python-trove-classifiers.SlackBuild b/source/l/python-trove-classifiers/python-trove-classifiers.SlackBuild index c66ac9763..9ac031b65 100755 --- a/source/l/python-trove-classifiers/python-trove-classifiers.SlackBuild +++ b/source/l/python-trove-classifiers/python-trove-classifiers.SlackBuild @@ -23,13 +23,14 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-trove-classifiers -VERSION=${VERSION:-$(echo trove-classifiers-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +SRCNAM=trove_classifiers +VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -45,17 +46,14 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then 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" = "s390" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi TMP=${TMP:-/tmp} @@ -65,9 +63,9 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf trove-classifiers-$VERSION -tar xvf $CWD/trove-classifiers-$VERSION.tar.?z || exit 1 -cd trove-classifiers-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 +cd $SRCNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/l/python-trove-classifiers/trove-classifiers.url b/source/l/python-trove-classifiers/trove_classifiers.url index 964f8a77b..964f8a77b 100644 --- a/source/l/python-trove-classifiers/trove-classifiers.url +++ b/source/l/python-trove-classifiers/trove_classifiers.url diff --git a/source/l/python-typing_extensions/slack-desc b/source/l/python-typing_extensions/slack-desc deleted file mode 100644 index 755ad4bfd..000000000 --- a/source/l/python-typing_extensions/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-typing_extensions: python-typing_extensions (experimental type hints) -python-typing_extensions: -python-typing_extensions: Enable use of new type system features on older Python versions. For -python-typing_extensions: example, typing.TypeGuard is new in Python 3.10, but typing_extensions -python-typing_extensions: allows users on previous Python versions to use it too. -python-typing_extensions: -python-typing_extensions: Homepage: https://pypi.org/project/typing-extensions -python-typing_extensions: -python-typing_extensions: -python-typing_extensions: -python-typing_extensions: diff --git a/source/l/python-typing_extensions/typing_extensions.url b/source/l/python-typing_extensions/typing_extensions.url deleted file mode 100644 index 28ef321a0..000000000 --- a/source/l/python-typing_extensions/typing_extensions.url +++ /dev/null @@ -1 +0,0 @@ -https://pypi.org/project/typing-extensions diff --git a/source/l/python-typogrify/python-typogrify.SlackBuild b/source/l/python-typogrify/python-typogrify.SlackBuild index 2a3b60afe..283403cfc 100755 --- a/source/l/python-typogrify/python-typogrify.SlackBuild +++ b/source/l/python-typogrify/python-typogrify.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-typogrify VERSION=${VERSION:-$(echo typogrify-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/python-urllib3/python-urllib3.SlackBuild b/source/l/python-urllib3/python-urllib3.SlackBuild index f1848a343..13fcd1a7f 100755 --- a/source/l/python-urllib3/python-urllib3.SlackBuild +++ b/source/l/python-urllib3/python-urllib3.SlackBuild @@ -31,7 +31,7 @@ SRCNAM=urllib3 if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac diff --git a/source/l/python-urllib3/urllib3.url b/source/l/python-urllib3/urllib3.url index ad87d82bf..c00db1afc 100644 --- a/source/l/python-urllib3/urllib3.url +++ b/source/l/python-urllib3/urllib3.url @@ -1 +1 @@ -https://github.com/shazow/urllib3 +https://pypi.org/project/urllib3 diff --git a/source/l/python-webencodings/python-webencodings.SlackBuild b/source/l/python-webencodings/python-webencodings.SlackBuild index 6a6295050..8ce655e6e 100755 --- a/source/l/python-webencodings/python-webencodings.SlackBuild +++ b/source/l/python-webencodings/python-webencodings.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-webencodings SRCNAM=webencodings VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-wheel/python-wheel.SlackBuild b/source/l/python-wheel/python-wheel.SlackBuild index 1ed68963f..25852fa42 100755 --- a/source/l/python-wheel/python-wheel.SlackBuild +++ b/source/l/python-wheel/python-wheel.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -45,18 +45,15 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then 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" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "${ARCH}" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi TMP=${TMP:-/tmp} diff --git a/source/l/python-zipp/python-zipp.SlackBuild b/source/l/python-zipp/python-zipp.SlackBuild index dd5dbbe56..2339b9740 100755 --- a/source/l/python-zipp/python-zipp.SlackBuild +++ b/source/l/python-zipp/python-zipp.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac diff --git a/source/l/qt5-webkit/qt5-webkit.SlackBuild b/source/l/qt5-webkit/qt5-webkit.SlackBuild index b0bd6ddc2..0e316f437 100755 --- a/source/l/qt5-webkit/qt5-webkit.SlackBuild +++ b/source/l/qt5-webkit/qt5-webkit.SlackBuild @@ -28,12 +28,12 @@ PKGNAM=qt5-webkit SRCNAM=qtwebkit SRCVER=${SRCVER:-5.212.0-alpha4} VERSION=$(echo $SRCVER | tr - _) -BUILD=${BUILD:-12} +BUILD=${BUILD:-13} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -55,13 +55,13 @@ if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" elif [ "$ARCH" = "armv7hl" ]; then SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" @@ -109,6 +109,9 @@ zcat $CWD/webkit-offlineasm-warnings-ruby27.patch | patch -p1 --verbose || exit # Fix for gcc13: zcat $CWD/qt5-webkit.gcc13.diff.gz | patch -p1 --verbose || exit 1 +# Fix for gcc14: +zcat $CWD/qtwebkit-fix-build-gcc14.patch.gz | patch -p1 --verbose || exit 1 + # Fix for icu68: zcat $CWD/icu68.patch.gz | patch -p0 --verbose || exit 1 diff --git a/source/l/qt5-webkit/qtwebkit-fix-build-gcc14.patch b/source/l/qt5-webkit/qtwebkit-fix-build-gcc14.patch new file mode 100644 index 000000000..870b6e28d --- /dev/null +++ b/source/l/qt5-webkit/qtwebkit-fix-build-gcc14.patch @@ -0,0 +1,15 @@ +diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp +index 9e726d5..4876f0f 100644 +--- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp ++++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp +@@ -231,8 +231,9 @@ bool isAllowedByAllWithHashFromContent(const CSPDirectiveListVector& policies, c + auto cryptoDigest = CryptoDigest::create(toCryptoDigestAlgorithm(algorithm)); + cryptoDigest->addBytes(contentCString.data(), contentCString.length()); + Vector<uint8_t> digest = cryptoDigest->computeHash(); ++ ContentSecurityPolicyHash hash = std::make_pair(algorithm, digest); + for (auto& policy : policies) { +- if ((policy.get()->*allowed)(std::make_pair(algorithm, digest))) ++ if ((policy.get()->*allowed)(hash)) + return true; + } + } diff --git a/source/l/qt5/fetch_sources.sh b/source/l/qt5/fetch_sources.sh index d18d453b7..85305fb45 100755 --- a/source/l/qt5/fetch_sources.sh +++ b/source/l/qt5/fetch_sources.sh @@ -21,7 +21,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -BRANCH="5.15.13" +BRANCH="5.15.15" rm -f qt-everywhere-src-*.tar* diff --git a/source/l/qt5/patches/qt5-webengine-ffmpeg7.patch b/source/l/qt5/patches/qt5-webengine-ffmpeg7.patch new file mode 100644 index 000000000..a2e9fc9a4 --- /dev/null +++ b/source/l/qt5/patches/qt5-webengine-ffmpeg7.patch @@ -0,0 +1,497 @@ +From 6e554a30893150793c2638e3689cf208ffc8e375 Mon Sep 17 00:00:00 2001 +From: Dale Curtis <dalecurtis@chromium.org> +Date: Sat, 2 Apr 2022 05:13:53 +0000 +Subject: [PATCH] Roll src/third_party/ffmpeg/ 574c39cce..32b2d1d526 (1125 + commits) + +https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/574c39cce323..32b2d1d526 + +Created with: + roll-dep src/third_party/ffmpeg + +Fixed: 1293918 +Cq-Include-Trybots: luci.chromium.try:mac_chromium_asan_rel_ng,linux_chromium_asan_rel_ng,linux_chromium_chromeos_asan_rel_ng +Change-Id: I41945d0f963e3d1f65940067bac22f63b68e37d2 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3565647 +Auto-Submit: Dale Curtis <dalecurtis@chromium.org> +Reviewed-by: Dan Sanders <sandersd@chromium.org> +Commit-Queue: Dale Curtis <dalecurtis@chromium.org> +Cr-Commit-Position: refs/heads/main@{#988253} +--- + .../clear_key_cdm/ffmpeg_cdm_audio_decoder.cc | 29 ++++++++++--------- + media/ffmpeg/ffmpeg_common.cc | 11 +++---- + media/filters/audio_file_reader.cc | 9 +++--- + media/filters/audio_file_reader_unittest.cc | 6 ++-- + .../filters/audio_video_metadata_extractor.cc | 11 +++++-- + .../filters/ffmpeg_aac_bitstream_converter.cc | 7 +++-- + ...ffmpeg_aac_bitstream_converter_unittest.cc | 2 +- + media/filters/ffmpeg_audio_decoder.cc | 13 +++++---- + 8 files changed, 51 insertions(+), 37 deletions(-) + +diff --git a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc +index e4fc3f460e2..9b1ad9f7675 100644 +--- a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc ++++ b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc +@@ -74,7 +74,7 @@ void CdmAudioDecoderConfigToAVCodecContext( + codec_context->sample_fmt = AV_SAMPLE_FMT_NONE; + } + +- codec_context->channels = config.channel_count; ++ codec_context->ch_layout.nb_channels = config.channel_count; + codec_context->sample_rate = config.samples_per_second; + + if (config.extra_data) { +@@ -124,8 +124,8 @@ void CopySamples(cdm::AudioFormat cdm_format, + case cdm::kAudioFormatPlanarS16: + case cdm::kAudioFormatPlanarF32: { + const int decoded_size_per_channel = +- decoded_audio_size / av_frame.channels; +- for (int i = 0; i < av_frame.channels; ++i) { ++ decoded_audio_size / av_frame.ch_layout.nb_channels; ++ for (int i = 0; i < av_frame.ch_layout.nb_channels; ++i) { + memcpy(output_buffer, av_frame.extended_data[i], + decoded_size_per_channel); + output_buffer += decoded_size_per_channel; +@@ -185,13 +185,14 @@ bool FFmpegCdmAudioDecoder::Initialize( + // Success! + decoding_loop_.reset(new FFmpegDecodingLoop(codec_context_.get())); + samples_per_second_ = config.samples_per_second; +- bytes_per_frame_ = codec_context_->channels * config.bits_per_channel / 8; ++ bytes_per_frame_ = ++ codec_context_->ch_layout.nb_channels * config.bits_per_channel / 8; + output_timestamp_helper_.reset( + new AudioTimestampHelper(config.samples_per_second)); + is_initialized_ = true; + + // Store initial values to guard against midstream configuration changes. +- channels_ = codec_context_->channels; ++ channels_ = codec_context_->ch_layout.nb_channels; + av_sample_format_ = codec_context_->sample_fmt; + + return true; +@@ -291,17 +292,18 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer( + for (auto& frame : audio_frames) { + int decoded_audio_size = 0; + if (frame->sample_rate != samples_per_second_ || +- frame->channels != channels_ || frame->format != av_sample_format_) { ++ frame->ch_layout.nb_channels != channels_ || ++ frame->format != av_sample_format_) { + DLOG(ERROR) << "Unsupported midstream configuration change!" + << " Sample Rate: " << frame->sample_rate << " vs " +- << samples_per_second_ << ", Channels: " << frame->channels ++ << samples_per_second_ << ", Channels: " << frame->ch_layout.nb_channels + << " vs " << channels_ << ", Sample Format: " << frame->format + << " vs " << av_sample_format_; + return cdm::kDecodeError; + } + + decoded_audio_size = av_samples_get_buffer_size( +- nullptr, codec_context_->channels, frame->nb_samples, ++ nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples, + codec_context_->sample_fmt, 1); + if (!decoded_audio_size) + continue; +@@ -320,7 +323,7 @@ bool FFmpegCdmAudioDecoder::OnNewFrame( + size_t* total_size, + std::vector<std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame>>* audio_frames, + AVFrame* frame) { +- *total_size += av_samples_get_buffer_size(nullptr, codec_context_->channels, ++ *total_size += av_samples_get_buffer_size(nullptr, codec_context_->ch_layout.nb_channels, + frame->nb_samples, + codec_context_->sample_fmt, 1); + audio_frames->emplace_back(av_frame_clone(frame)); +diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc +index 87ca8969626..76f03d6608e 100644 +--- a/media/ffmpeg/ffmpeg_common.cc ++++ b/media/ffmpeg/ffmpeg_common.cc +@@ -345,10 +345,11 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context, + codec_context->sample_fmt, codec_context->codec_id); + + ChannelLayout channel_layout = +- codec_context->channels > 8 ++ codec_context->ch_layout.nb_channels > 8 + ? CHANNEL_LAYOUT_DISCRETE +- : ChannelLayoutToChromeChannelLayout(codec_context->channel_layout, +- codec_context->channels); ++ : ChannelLayoutToChromeChannelLayout( ++ codec_context->ch_layout.u.mask, ++ codec_context->ch_layout.nb_channels); + + int sample_rate = codec_context->sample_rate; + switch (codec) { +@@ -401,7 +402,7 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context, + extra_data, encryption_scheme, seek_preroll, + codec_context->delay); + if (channel_layout == CHANNEL_LAYOUT_DISCRETE) +- config->SetChannelsForDiscrete(codec_context->channels); ++ config->SetChannelsForDiscrete(codec_context->ch_layout.nb_channels); + + #if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO) + // These are bitstream formats unknown to ffmpeg, so they don't have +@@ -470,7 +471,7 @@ void AudioDecoderConfigToAVCodecContext(const AudioDecoderConfig& config, + + // TODO(scherkus): should we set |channel_layout|? I'm not sure if FFmpeg uses + // said information to decode. +- codec_context->channels = config.channels(); ++ codec_context->ch_layout.nb_channels = config.channels(); + codec_context->sample_rate = config.samples_per_second(); + + if (config.extra_data().empty()) { +diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc +index 5f257bdfaa6..e1be5aa9a5b 100644 +--- a/media/filters/audio_file_reader.cc ++++ b/media/filters/audio_file_reader.cc +@@ -113,14 +113,15 @@ bool AudioFileReader::OpenDecoder() { + + // Verify the channel layout is supported by Chrome. Acts as a sanity check + // against invalid files. See http://crbug.com/171962 +- if (ChannelLayoutToChromeChannelLayout(codec_context_->channel_layout, +- codec_context_->channels) == ++ if (ChannelLayoutToChromeChannelLayout( ++ codec_context_->ch_layout.u.mask, ++ codec_context_->ch_layout.nb_channels) == + CHANNEL_LAYOUT_UNSUPPORTED) { + return false; + } + + // Store initial values to guard against midstream configuration changes. +- channels_ = codec_context_->channels; ++ channels_ = codec_context_->ch_layout.nb_channels; + audio_codec_ = CodecIDToAudioCodec(codec_context_->codec_id); + sample_rate_ = codec_context_->sample_rate; + av_sample_format_ = codec_context_->sample_fmt; +@@ -223,7 +224,7 @@ bool AudioFileReader::OnNewFrame( + if (frames_read < 0) + return false; + +- const int channels = frame->channels; ++ const int channels = frame->ch_layout.nb_channels; + if (frame->sample_rate != sample_rate_ || channels != channels_ || + frame->format != av_sample_format_) { + DLOG(ERROR) << "Unsupported midstream configuration change!" +diff --git a/media/filters/ffmpeg_aac_bitstream_converter.cc b/media/filters/ffmpeg_aac_bitstream_converter.cc +index 6f231c85729..ca5e5fb927d 100644 +--- a/media/filters/ffmpeg_aac_bitstream_converter.cc ++++ b/media/filters/ffmpeg_aac_bitstream_converter.cc +@@ -195,14 +195,15 @@ bool FFmpegAACBitstreamConverter::ConvertPacket(AVPacket* packet) { + if (!header_generated_ || codec_ != stream_codec_parameters_->codec_id || + audio_profile_ != stream_codec_parameters_->profile || + sample_rate_index_ != sample_rate_index || +- channel_configuration_ != stream_codec_parameters_->channels || ++ channel_configuration_ != ++ stream_codec_parameters_->ch_layout.nb_channels || + frame_length_ != header_plus_packet_size) { + header_generated_ = + GenerateAdtsHeader(stream_codec_parameters_->codec_id, + 0, // layer + stream_codec_parameters_->profile, sample_rate_index, + 0, // private stream +- stream_codec_parameters_->channels, ++ stream_codec_parameters_->ch_layout.nb_channels, + 0, // originality + 0, // home + 0, // copyrighted_stream +@@ -214,7 +215,7 @@ bool FFmpegAACBitstreamConverter::ConvertPacket(AVPacket* packet) { + codec_ = stream_codec_parameters_->codec_id; + audio_profile_ = stream_codec_parameters_->profile; + sample_rate_index_ = sample_rate_index; +- channel_configuration_ = stream_codec_parameters_->channels; ++ channel_configuration_ = stream_codec_parameters_->ch_layout.nb_channels; + frame_length_ = header_plus_packet_size; + } + +diff --git a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc +index 1fd4c5ccd7d..f59bcd8fdaf 100644 +--- a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc ++++ b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc +@@ -34,7 +34,7 @@ class FFmpegAACBitstreamConverterTest : public testing::Test { + memset(&test_parameters_, 0, sizeof(AVCodecParameters)); + test_parameters_.codec_id = AV_CODEC_ID_AAC; + test_parameters_.profile = FF_PROFILE_AAC_MAIN; +- test_parameters_.channels = 2; ++ test_parameters_.ch_layout.nb_channels = 2; + test_parameters_.extradata = extradata_header_; + test_parameters_.extradata_size = sizeof(extradata_header_); + } +diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc +index 6a56c675f7d..4615fdeb3fb 100644 +--- a/media/filters/ffmpeg_audio_decoder.cc ++++ b/media/filters/ffmpeg_audio_decoder.cc +@@ -28,7 +28,7 @@ namespace media { + + // Return the number of channels from the data in |frame|. + static inline int DetermineChannels(AVFrame* frame) { +- return frame->channels; ++ return frame->ch_layout.nb_channels; + } + + // Called by FFmpeg's allocation routine to allocate a buffer. Uses +@@ -231,7 +231,7 @@ bool FFmpegAudioDecoder::OnNewFrame(const DecoderBuffer& buffer, + // Translate unsupported into discrete layouts for discrete configurations; + // ffmpeg does not have a labeled discrete configuration internally. + ChannelLayout channel_layout = ChannelLayoutToChromeChannelLayout( +- codec_context_->channel_layout, codec_context_->channels); ++ codec_context_->ch_layout.u.mask, codec_context_->ch_layout.nb_channels); + if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED && + config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE) { + channel_layout = CHANNEL_LAYOUT_DISCRETE; +@@ -348,11 +348,11 @@ bool FFmpegAudioDecoder::ConfigureDecoder(const AudioDecoderConfig& config) { + // Success! + av_sample_format_ = codec_context_->sample_fmt; + +- if (codec_context_->channels != config.channels()) { ++ if (codec_context_->ch_layout.nb_channels != config.channels()) { + MEDIA_LOG(ERROR, media_log_) + << "Audio configuration specified " << config.channels() + << " channels, but FFmpeg thinks the file contains " +- << codec_context_->channels << " channels"; ++ << codec_context_->ch_layout.nb_channels << " channels"; + ReleaseFFmpegResources(); + state_ = DecoderState::kUninitialized; + return false; +@@ -403,7 +403,7 @@ int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s, + if (frame->nb_samples <= 0) + return AVERROR(EINVAL); + +- if (s->channels != channels) { ++ if (s->ch_layout.nb_channels != channels) { + DLOG(ERROR) << "AVCodecContext and AVFrame disagree on channel count."; + return AVERROR(EINVAL); + } +@@ -436,7 +436,8 @@ int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s, + ChannelLayout channel_layout = + config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE + ? CHANNEL_LAYOUT_DISCRETE +- : ChannelLayoutToChromeChannelLayout(s->channel_layout, s->channels); ++ : ChannelLayoutToChromeChannelLayout(s->ch_layout.u.mask, ++ s->ch_layout.nb_channels); + + if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED) { + DLOG(ERROR) << "Unsupported channel layout."; +commit 62274859104bd828373ae406aa9309e610449ac5 +Author: Ted Meyer <tmathmeyer@chromium.org> +Date: Fri Mar 22 19:56:55 2024 +0000 + + Replace deprecated use of AVCodecContext::reordered_opaque + + We can use the AV_CODEC_FLAG_COPY_OPAQUE flag on the codec context + now to trigger timestamp propagation. + + Bug: 330573128 + Change-Id: I6bc57241a35ab5283742aad8d42acb4dc5e85858 + Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5384308 + Commit-Queue: Ted (Chromium) Meyer <tmathmeyer@chromium.org> + Reviewed-by: Dan Sanders <sandersd@chromium.org> + Cr-Commit-Position: refs/heads/main@{#1277051} + +diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc +index bd75477feeabb..8a658a58caac5 100644 +--- a/media/filters/ffmpeg_video_decoder.cc ++++ b/media/filters/ffmpeg_video_decoder.cc +@@ -134,7 +134,7 @@ bool FFmpegVideoDecoder::IsCodecSupported(VideoCodec codec) { + } + + FFmpegVideoDecoder::FFmpegVideoDecoder(MediaLog* media_log) +- : media_log_(media_log), state_(kUninitialized), decode_nalus_(false) { ++ : media_log_(media_log), state_(kUninitialized), decode_nalus_(false), timestamp_map_(128) { + DVLOG(1) << __func__; + thread_checker_.DetachFromThread(); + } +@@ -363,8 +363,10 @@ bool FFmpegVideoDecoder::FFmpegDecode(const DecoderBuffer& buffer) { + DCHECK(packet.data); + DCHECK_GT(packet.size, 0); + +- // Let FFmpeg handle presentation timestamp reordering. +- codec_context_->reordered_opaque = buffer.timestamp().InMicroseconds(); ++ const int64_t timestamp = buffer.timestamp().InMicroseconds(); ++ const TimestampId timestamp_id = timestamp_id_generator_.GenerateNextId(); ++ timestamp_map_.Put(timestamp_id, timestamp); ++ packet.opaque = reinterpret_cast<void*>(timestamp_id.GetUnsafeValue()); + } + FFmpegDecodingLoop::DecodeStatus decode_status = decoding_loop_->DecodePacket( + packet, base::BindRepeating(&FFmpegVideoDecoder::OnNewFrame, +@@ -423,8 +425,13 @@ bool FFmpegVideoDecoder::OnNewFrame(AVFrame* frame) { + + scoped_refptr<VideoFrame> video_frame = + reinterpret_cast<VideoFrame*>(av_buffer_get_opaque(frame->buf[0])); ++ const auto ts_id = TimestampId(reinterpret_cast<size_t>(frame->opaque)); ++ const auto ts_lookup = timestamp_map_.Get(ts_id); ++ if (ts_lookup == timestamp_map_.end()) { ++ return false; ++ } + video_frame->set_timestamp( +- base::TimeDelta::FromMicroseconds(frame->reordered_opaque)); ++ base::TimeDelta::FromMicroseconds(std::get<1>(*ts_lookup))); + video_frame->metadata()->power_efficient = false; + output_cb_.Run(video_frame); + return true; +@@ -498,8 +505,10 @@ bool FFmpegVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config, + codec_context_->thread_count = GetFFmpegVideoDecoderThreadCount(config); + codec_context_->thread_type = + FF_THREAD_SLICE | (low_delay ? 0 : FF_THREAD_FRAME); ++ + codec_context_->opaque = this; + codec_context_->get_buffer2 = GetVideoBufferImpl; ++ codec_context_->flags |= AV_CODEC_FLAG_COPY_OPAQUE; + + if (base::FeatureList::IsEnabled(kFFmpegAllowLists)) { + // Note: FFmpeg will try to free this string, so we must duplicate it. +diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h +index d02cb89c3ddf7..0a2de1c623fff 100644 +--- a/media/filters/ffmpeg_video_decoder.h ++++ b/media/filters/ffmpeg_video_decoder.h +@@ -7,6 +7,8 @@ + #include <list> + #include <memory> + ++#include "base/containers/mru_cache.h" ++#include "base/util/type_safety/id_type.h" + #include "base/callback.h" + #include "base/macros.h" + #include "base/memory/ref_counted.h" +@@ -87,6 +89,20 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder { + // FFmpeg structures owned by this object. + std::unique_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_; + ++ // The gist here is that timestamps need to be 64 bits to store microsecond ++ // precision. A 32 bit integer would overflow at ~35 minutes at this level of ++ // precision. We can't cast the timestamp to the void ptr object used by the ++ // opaque field in ffmpeg then, because it would lose data on a 32 bit build. ++ // However, we don't actually have 2^31 timestamped frames in a single ++ // playback, so it's fine to use the 32 bit value as a key in a map which ++ // contains the actual timestamps. Additionally, we've in the past set 128 ++ // outstanding frames for re-ordering as a limit for cross-thread decoding ++ // tasks, so we'll do that here too with the LRU cache. ++ using TimestampId = util::IdType<int64_t, size_t, 0>; ++ ++ TimestampId::Generator timestamp_id_generator_; ++ base::MRUCache<TimestampId, int64_t> timestamp_map_; ++ + VideoDecoderConfig config_; + + scoped_refptr<FrameBufferPool> frame_pool_; +diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc +index 3331581a6fee6..69539fd6594ec 100644 +--- a/media/ffmpeg/ffmpeg_common.cc ++++ b/media/ffmpeg/ffmpeg_common.cc +@@ -404,7 +404,9 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context, + #if BUILDFLAG(USE_PROPRIETARY_CODECS) + // TODO(dalecurtis): Just use the profile from the codec context if ffmpeg + // ever starts supporting xHE-AAC. +- if (codec == kCodecAAC && codec_context->profile == FF_PROFILE_UNKNOWN) { ++ constexpr uint8_t kXHEAAc = 41; ++ if (codec == kCodecAAC && codec_context->profile == FF_PROFILE_UNKNOWN || ++ codec_context->profile == kXHEAAc) { + // Errors aren't fatal here, so just drop any MediaLog messages. + NullMediaLog media_log; + mp4::AAC aac_parser; +diff --git a/media/ffmpeg/ffmpeg_regression_tests.cc b/media/ffmpeg/ffmpeg_regression_tests.cc +index 05dcb1cd62c75..866f446698947 100644 +--- a/media/ffmpeg/ffmpeg_regression_tests.cc ++++ b/media/ffmpeg/ffmpeg_regression_tests.cc +@@ -90,16 +90,16 @@ FFMPEG_TEST_CASE(Cr62127, + PIPELINE_ERROR_DECODE, + PIPELINE_ERROR_DECODE); + FFMPEG_TEST_CASE(Cr93620, "security/93620.ogg", PIPELINE_OK, PIPELINE_OK); +-FFMPEG_TEST_CASE(Cr100492, +- "security/100492.webm", +- DECODER_ERROR_NOT_SUPPORTED, +- DECODER_ERROR_NOT_SUPPORTED); ++FFMPEG_TEST_CASE(Cr100492, "security/100492.webm", PIPELINE_OK, PIPELINE_OK); + FFMPEG_TEST_CASE(Cr100543, "security/100543.webm", PIPELINE_OK, PIPELINE_OK); + FFMPEG_TEST_CASE(Cr101458, + "security/101458.webm", + PIPELINE_ERROR_DECODE, + PIPELINE_ERROR_DECODE); +-FFMPEG_TEST_CASE(Cr108416, "security/108416.webm", PIPELINE_OK, PIPELINE_OK); ++FFMPEG_TEST_CASE(Cr108416, ++ "security/108416.webm", ++ PIPELINE_ERROR_DECODE, ++ PIPELINE_ERROR_DECODE); + FFMPEG_TEST_CASE(Cr110849, + "security/110849.mkv", + DEMUXER_ERROR_COULD_NOT_OPEN, +@@ -154,7 +154,10 @@ FFMPEG_TEST_CASE(Cr234630b, + "security/234630b.mov", + DEMUXER_ERROR_NO_SUPPORTED_STREAMS, + DEMUXER_ERROR_NO_SUPPORTED_STREAMS); +-FFMPEG_TEST_CASE(Cr242786, "security/242786.webm", PIPELINE_OK, PIPELINE_OK); ++FFMPEG_TEST_CASE(Cr242786, ++ "security/242786.webm", ++ PIPELINE_OK, ++ PIPELINE_ERROR_DECODE); + // Test for out-of-bounds access with slightly corrupt file (detection logic + // thinks it's a MONO file, but actually contains STEREO audio). + FFMPEG_TEST_CASE(Cr275590, +@@ -372,8 +375,8 @@ FFMPEG_TEST_CASE(WEBM_2, + DEMUXER_ERROR_NO_SUPPORTED_STREAMS); + FFMPEG_TEST_CASE(WEBM_4, + "security/out.webm.68798.1929", +- DECODER_ERROR_NOT_SUPPORTED, +- DECODER_ERROR_NOT_SUPPORTED); ++ PIPELINE_OK, ++ PIPELINE_OK); + FFMPEG_TEST_CASE(WEBM_5, "frame_size_change.webm", PIPELINE_OK, PIPELINE_OK); + + // General MKV test cases. +diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc +index 8a658a58caac5..9d6ed8aeb5c48 100644 +--- a/media/filters/ffmpeg_video_decoder.cc ++++ b/media/filters/ffmpeg_video_decoder.cc +@@ -213,7 +213,6 @@ int FFmpegVideoDecoder::GetVideoBuffer(struct AVCodecContext* codec_context, + frame->width = coded_size.width(); + frame->height = coded_size.height(); + frame->format = codec_context->pix_fmt; +- frame->reordered_opaque = codec_context->reordered_opaque; + + // Now create an AVBufferRef for the data just allocated. It will own the + // reference to the VideoFrame object. +diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc +index e1be5aa9a5b13..951c003956fb5 100644 +--- a/media/filters/audio_file_reader.cc ++++ b/media/filters/audio_file_reader.cc +@@ -243,10 +243,10 @@ bool AudioFileReader::OnNewFrame( + // silence from being output. In the case where we are also discarding some + // portion of the packet (as indicated by a negative pts), we further want to + // adjust the duration downward by however much exists before zero. +- if (audio_codec_ == kCodecAAC && frame->pkt_duration) { ++ if (audio_codec_ == kCodecAAC && frame->duration) { + const base::TimeDelta pkt_duration = ConvertFromTimeBase( + glue_->format_context()->streams[stream_index_]->time_base, +- frame->pkt_duration + std::min(static_cast<int64_t>(0), frame->pts)); ++ frame->duration + std::min(static_cast<int64_t>(0), frame->pts)); + const base::TimeDelta frame_duration = base::TimeDelta::FromSecondsD( + frames_read / static_cast<double>(sample_rate_)); + +diff --git a/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc +index c6446c2..805b95b 100644 +--- a/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc ++++ b/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc +@@ -114,7 +114,6 @@ int H264DecoderImpl::AVGetBuffer2(AVCodecContext* context, + int total_size = y_size + 2 * uv_size; + + av_frame->format = context->pix_fmt; +- av_frame->reordered_opaque = context->reordered_opaque; + + // Set |av_frame| members as required by FFmpeg. + av_frame->data[kYPlaneIndex] = frame_buffer->MutableDataY(); +@@ -273,8 +272,6 @@ int32_t H264DecoderImpl::Decode(const EncodedImage& input_image, + return WEBRTC_VIDEO_CODEC_ERROR; + } + packet.size = static_cast<int>(input_image.size()); +- int64_t frame_timestamp_us = input_image.ntp_time_ms_ * 1000; // ms -> μs +- av_context_->reordered_opaque = frame_timestamp_us; + + int result = avcodec_send_packet(av_context_.get(), &packet); + if (result < 0) { +@@ -290,10 +287,6 @@ int32_t H264DecoderImpl::Decode(const EncodedImage& input_image, + return WEBRTC_VIDEO_CODEC_ERROR; + } + +- // We don't expect reordering. Decoded frame tamestamp should match +- // the input one. +- RTC_DCHECK_EQ(av_frame_->reordered_opaque, frame_timestamp_us); +- + absl::optional<uint8_t> qp; + // TODO(sakal): Maybe it is possible to get QP directly from FFmpeg. + h264_bitstream_parser_.ParseBitstream(input_image.data(), input_image.size()); diff --git a/source/l/qt5/patches/qtwebengine.ninja1.12.patch b/source/l/qt5/patches/qtwebengine.ninja1.12.patch new file mode 100644 index 000000000..bced9b055 --- /dev/null +++ b/source/l/qt5/patches/qtwebengine.ninja1.12.patch @@ -0,0 +1,10 @@ +--- ./qtwebengine/src/3rdparty/chromium/content/browser/BUILD.gn.orig 2024-06-14 12:36:46.000000000 -0500 ++++ ./qtwebengine/src/3rdparty/chromium/content/browser/BUILD.gn 2024-06-14 14:21:54.876311154 -0500 +@@ -158,6 +158,7 @@ + "//components/payments/core", + "//components/payments/core:error_strings", + "//components/payments/mojom", ++ "//components/spellcheck:buildflags", + "//components/rappor", + "//components/services/filesystem:lib", + "//components/services/quarantine:quarantine", diff --git a/source/l/qt5/qt5.SlackBuild b/source/l/qt5/qt5.SlackBuild index 385b0841e..b1ddb2e36 100755 --- a/source/l/qt5/qt5.SlackBuild +++ b/source/l/qt5/qt5.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -41,7 +41,7 @@ SYSTEM_FFMPEG=${SYSTEM_FFMPEG:-YES} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -57,30 +57,15 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" SLKLDFLAGS="" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" SLKLDFLAGS="" SLKLDFLAGS="-L/usr/lib64" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - # To prevent "qatomic_armv6.h error: output number 2 not directly addressable" - # More permanent solution is to patch gcc: - # http://bazaar.launchpad.net/~linaro-toolchain-dev/gcc-linaro/4.6/revision/106731 - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fno-strict-volatile-bitfields" - SLKLDFLAGS="" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" SLKLDFLAGS="" @@ -145,6 +130,14 @@ cd qtwebengine/src/3rdparty zcat $CWD/patches/qt5-webengine-ffmpeg5.patch.gz | patch -p1 --verbose || exit 1 cd - 1>/dev/null +# Fix build with ffmpeg-7: +cd qtwebengine/src/3rdparty/chromium + zcat $CWD/patches/qt5-webengine-ffmpeg7.patch.gz | patch -p1 --verbose || exit 1 +cd - 1>/dev/null + +# Fix build with recent ninja: +zcat $CWD/patches/qtwebengine.ninja1.12.patch.gz | patch -p1 --verbose || exit 1 + # CMake generates wrong -isystem /usr/include compilations flags with Qt5::Gui # and for it breaks KWin compilation with: # /usr/include/c++/9.1.0/cstdlib:75:15: fatal error: stdlib.h: No such file or directory diff --git a/source/l/qt6/fetch_sources.sh b/source/l/qt6/fetch_sources.sh index 780905738..a0ee2dc3f 100755 --- a/source/l/qt6/fetch_sources.sh +++ b/source/l/qt6/fetch_sources.sh @@ -21,7 +21,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -BRANCH="6.6.3" +BRANCH="6.7.2" rm -f qt-everywhere-src-*.tar* @@ -34,11 +34,12 @@ cd qt5 # Sync qtwebengine version with the rest of qt5 sed -i -E "s/6.6.(.*)/$BRANCH\"\)/" qtwebengine/.cmake.conf - for i in $(find . -type d -name "qt*" -maxdepth 1); do - cd $i - ../qtbase/libexec/syncqt.pl -version $BRANCH - cd .. - done + ## Hmmm... syncqt.pl appears to be no more in 6.7.0: + #for i in $(find . -type d -name "qt*" -maxdepth 1); do + # cd $i + # ../qtbase/libexec/syncqt.pl -version $BRANCH + # cd .. + #done # Not in the release tarball for 6.6.1: rm -rf README.git init-repository \ diff --git a/source/l/qt6/patches/92bcb8f6b7a852c7a5d662fc34de561692a7a454.patch b/source/l/qt6/patches/92bcb8f6b7a852c7a5d662fc34de561692a7a454.patch new file mode 100644 index 000000000..ac63876c7 --- /dev/null +++ b/source/l/qt6/patches/92bcb8f6b7a852c7a5d662fc34de561692a7a454.patch @@ -0,0 +1,37 @@ +From 92bcb8f6b7a852c7a5d662fc34de561692a7a454 Mon Sep 17 00:00:00 2001 +From: Vlad Zahorodnii <vlad.zahorodnii@kde.org> +Date: Thu, 20 Jun 2024 11:25:06 +0300 +Subject: [PATCH] Client: Ensure that guessed popup parent has a shell surface + +The last input window may not have a shell surface if it is a subsurface +or that window has been just made invisible. + +Change-Id: Iad11c68659579429ddc5d9ba0038975b25da8e0d +Reviewed-by: David Edmundson <davidedmundson@kde.org> +(cherry picked from commit 52c406cec149634680489faeeaf06bb1258cd12f) +Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> +(cherry picked from commit 7d04c18531276c94bfdf2f9a955d6f02554b28b2) +--- + src/client/qwaylandwindow.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp +index 22aeba102..c3725ffc9 100644 +--- a/src/client/qwaylandwindow.cpp ++++ b/src/client/qwaylandwindow.cpp +@@ -1157,8 +1157,10 @@ QWaylandWindow *QWaylandWindow::guessTransientParent() const + return mTopPopup; + } + +- if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup) +- return display()->lastInputWindow(); ++ if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup) { ++ if (auto lastInputWindow = display()->lastInputWindow()) ++ return closestShellSurfaceWindow(lastInputWindow->window()); ++ } + + return nullptr; + } +-- +GitLab + diff --git a/source/l/qt6/patches/qt6-3d_gcc13.patch b/source/l/qt6/patches/qt6-3d_gcc13.patch deleted file mode 100644 index 7128597de..000000000 --- a/source/l/qt6/patches/qt6-3d_gcc13.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp.orig 2023-09-24 13:38:48.000000000 +0200 -+++ qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp 2023-10-04 14:00:15.901256244 +0200 -@@ -51,6 +51,7 @@ - #include "FBXUtil.h" - #include <assimp/defs.h> - #include <stdint.h> -+#include <cstdint> - #include <assimp/Exceptional.h> - #include <assimp/ByteSwapper.h> - #include <assimp/DefaultLogger.hpp> - diff --git a/source/l/qt6/patches/qtwebengine-6.7.0-displaykey-header.patch b/source/l/qt6/patches/qtwebengine-6.7.0-displaykey-header.patch new file mode 100644 index 000000000..84dce821f --- /dev/null +++ b/source/l/qt6/patches/qtwebengine-6.7.0-displaykey-header.patch @@ -0,0 +1,12 @@ +TODO: merge with glx-headers patch in patchset, similar +issues that seem to stem from Qt's GLX restoration. + +https://bugs.gentoo.org/930107#c8 +--- a/src/3rdparty/chromium/ui/gl/gl_display.h ++++ b/src/3rdparty/chromium/ui/gl/gl_display.h +@@ -12,4 +12,5 @@ + + #include "ui/gl/gl_export.h" ++#include "ui/gl/gpu_preference.h" + + #if defined(USE_EGL) diff --git a/source/l/qt6/patches/qtwebengine-6.7.0-ninja1.12.patch b/source/l/qt6/patches/qtwebengine-6.7.0-ninja1.12.patch new file mode 100644 index 000000000..2d12daccd --- /dev/null +++ b/source/l/qt6/patches/qtwebengine-6.7.0-ninja1.12.patch @@ -0,0 +1,30 @@ +Patch status: pending being looked at upstream + +Issue[1][2][3] also exist in chromium itself[4], and unclear +why this started happening only with ninja-1.12.0 at the moment. + +Just a quickfix, likely not fully correct and seems there may +be further unresolved race issues. + +[1] https://bugs.gentoo.org/930107 +[2] https://bugreports.qt.io/browse/QTBUG-124375 +[3] https://github.com/ninja-build/ninja/issues/2417 +[4] https://bugs.gentoo.org/930112 +--- a/src/3rdparty/chromium/content/browser/BUILD.gn ++++ b/src/3rdparty/chromium/content/browser/BUILD.gn +@@ -198,2 +198,3 @@ + "//components/services/storage/public/mojom", ++ "//components/spellcheck:buildflags", + "//components/sqlite_proto", +--- a/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn ++++ b/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn +@@ -22,2 +22,3 @@ + "//content/public/browser", ++ "//components/web_cache/public/mojom", + "//extensions/common", +--- a/src/core/configure/BUILD.root.gn.in ++++ b/src/core/configure/BUILD.root.gn.in +@@ -235,2 +235,3 @@ + deps = [ ++ "//chrome/app:generated_resources", + "//components/zoom", diff --git a/source/l/qt6/patches/qtwebengine-ffmpeg-7.patch b/source/l/qt6/patches/qtwebengine-ffmpeg-7.patch new file mode 100644 index 000000000..616b436ff --- /dev/null +++ b/source/l/qt6/patches/qtwebengine-ffmpeg-7.patch @@ -0,0 +1,585 @@ +From 6e554a30893150793c2638e3689cf208ffc8e375 Mon Sep 17 00:00:00 2001 +From: Dale Curtis <dalecurtis@chromium.org> +Date: Sat, 2 Apr 2022 05:13:53 +0000 +Subject: [PATCH] Roll src/third_party/ffmpeg/ 574c39cce..32b2d1d526 (1125 + commits) + +https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/574c39cce323..32b2d1d526 + +Created with: + roll-dep src/third_party/ffmpeg + +Fixed: 1293918 +Cq-Include-Trybots: luci.chromium.try:mac_chromium_asan_rel_ng,linux_chromium_asan_rel_ng,linux_chromium_chromeos_asan_rel_ng +Change-Id: I41945d0f963e3d1f65940067bac22f63b68e37d2 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3565647 +Auto-Submit: Dale Curtis <dalecurtis@chromium.org> +Reviewed-by: Dan Sanders <sandersd@chromium.org> +Commit-Queue: Dale Curtis <dalecurtis@chromium.org> +Cr-Commit-Position: refs/heads/main@{#988253} +--- + .../clear_key_cdm/ffmpeg_cdm_audio_decoder.cc | 29 ++++++++++--------- + media/ffmpeg/ffmpeg_common.cc | 11 +++---- + media/filters/audio_file_reader.cc | 9 +++--- + media/filters/audio_file_reader_unittest.cc | 6 ++-- + .../filters/audio_video_metadata_extractor.cc | 11 +++++-- + .../filters/ffmpeg_aac_bitstream_converter.cc | 7 +++-- + ...ffmpeg_aac_bitstream_converter_unittest.cc | 2 +- + media/filters/ffmpeg_audio_decoder.cc | 13 +++++---- + 8 files changed, 51 insertions(+), 37 deletions(-) + +diff --git a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc +index e4fc3f460e2..9b1ad9f7675 100644 +--- a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc ++++ b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc +@@ -74,7 +74,7 @@ void CdmAudioDecoderConfigToAVCodecContext( + codec_context->sample_fmt = AV_SAMPLE_FMT_NONE; + } + +- codec_context->channels = config.channel_count; ++ codec_context->ch_layout.nb_channels = config.channel_count; + codec_context->sample_rate = config.samples_per_second; + + if (config.extra_data) { +@@ -124,8 +124,8 @@ void CopySamples(cdm::AudioFormat cdm_format, + case cdm::kAudioFormatPlanarS16: + case cdm::kAudioFormatPlanarF32: { + const int decoded_size_per_channel = +- decoded_audio_size / av_frame.channels; +- for (int i = 0; i < av_frame.channels; ++i) { ++ decoded_audio_size / av_frame.ch_layout.nb_channels; ++ for (int i = 0; i < av_frame.ch_layout.nb_channels; ++i) { + memcpy(output_buffer, av_frame.extended_data[i], + decoded_size_per_channel); + output_buffer += decoded_size_per_channel; +@@ -185,13 +185,14 @@ bool FFmpegCdmAudioDecoder::Initialize( + // Success! + decoding_loop_ = std::make_unique<FFmpegDecodingLoop>(codec_context_.get()); + samples_per_second_ = config.samples_per_second; +- bytes_per_frame_ = codec_context_->channels * config.bits_per_channel / 8; ++ bytes_per_frame_ = ++ codec_context_->ch_layout.nb_channels * config.bits_per_channel / 8; + output_timestamp_helper_ = + std::make_unique<AudioTimestampHelper>(config.samples_per_second); + is_initialized_ = true; + + // Store initial values to guard against midstream configuration changes. +- channels_ = codec_context_->channels; ++ channels_ = codec_context_->ch_layout.nb_channels; + av_sample_format_ = codec_context_->sample_fmt; + + return true; +@@ -291,18 +292,19 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer( + for (auto& frame : audio_frames) { + int decoded_audio_size = 0; + if (frame->sample_rate != samples_per_second_ || +- frame->channels != channels_ || frame->format != av_sample_format_) { ++ frame->ch_layout.nb_channels != channels_ || ++ frame->format != av_sample_format_) { + DLOG(ERROR) << "Unsupported midstream configuration change!" + << " Sample Rate: " << frame->sample_rate << " vs " + << samples_per_second_ + << ", Channels: " << frame->ch_layout.nb_channels << " vs " + << channels_ << ", Sample Format: " << frame->format << " vs " + << av_sample_format_; + return cdm::kDecodeError; + } + + decoded_audio_size = av_samples_get_buffer_size( +- nullptr, codec_context_->channels, frame->nb_samples, ++ nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples, + codec_context_->sample_fmt, 1); + if (!decoded_audio_size) + continue; +@@ -320,9 +323,9 @@ bool FFmpegCdmAudioDecoder::OnNewFrame( + size_t* total_size, + std::vector<std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame>>* audio_frames, + AVFrame* frame) { +- *total_size += av_samples_get_buffer_size( +- nullptr, codec_context_->channels, frame->nb_samples, +- codec_context_->sample_fmt, 1); ++ *total_size += av_samples_get_buffer_size( ++ nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples, ++ codec_context_->sample_fmt, 1); + audio_frames->emplace_back(av_frame_clone(frame)); + return true; + } +diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc +index 87ca8969626..76f03d6608e 100644 +--- a/media/ffmpeg/ffmpeg_common.cc ++++ b/media/ffmpeg/ffmpeg_common.cc +@@ -345,10 +345,11 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context, + codec_context->sample_fmt, codec_context->codec_id); + + ChannelLayout channel_layout = +- codec_context->channels > 8 ++ codec_context->ch_layout.nb_channels > 8 + ? CHANNEL_LAYOUT_DISCRETE +- : ChannelLayoutToChromeChannelLayout(codec_context->channel_layout, +- codec_context->channels); ++ : ChannelLayoutToChromeChannelLayout( ++ codec_context->ch_layout.u.mask, ++ codec_context->ch_layout.nb_channels); + + int sample_rate = codec_context->sample_rate; + switch (codec) { +@@ -401,7 +402,7 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context, + extra_data, encryption_scheme, seek_preroll, + codec_context->delay); + if (channel_layout == CHANNEL_LAYOUT_DISCRETE) +- config->SetChannelsForDiscrete(codec_context->channels); ++ config->SetChannelsForDiscrete(codec_context->ch_layout.nb_channels); + + #if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO) + // These are bitstream formats unknown to ffmpeg, so they don't have +@@ -470,7 +471,7 @@ void AudioDecoderConfigToAVCodecContext(const AudioDecoderConfig& config, + + // TODO(scherkus): should we set |channel_layout|? I'm not sure if FFmpeg uses + // said information to decode. +- codec_context->channels = config.channels(); ++ codec_context->ch_layout.nb_channels = config.channels(); + codec_context->sample_rate = config.samples_per_second(); + + if (config.extra_data().empty()) { +diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc +index 5f257bdfaa6..e1be5aa9a5b 100644 +--- a/media/filters/audio_file_reader.cc ++++ b/media/filters/audio_file_reader.cc +@@ -113,14 +113,15 @@ bool AudioFileReader::OpenDecoder() { + + // Verify the channel layout is supported by Chrome. Acts as a sanity check + // against invalid files. See http://crbug.com/171962 +- if (ChannelLayoutToChromeChannelLayout(codec_context_->channel_layout, +- codec_context_->channels) == ++ if (ChannelLayoutToChromeChannelLayout( ++ codec_context_->ch_layout.u.mask, ++ codec_context_->ch_layout.nb_channels) == + CHANNEL_LAYOUT_UNSUPPORTED) { + return false; + } + + // Store initial values to guard against midstream configuration changes. +- channels_ = codec_context_->channels; ++ channels_ = codec_context_->ch_layout.nb_channels; + audio_codec_ = CodecIDToAudioCodec(codec_context_->codec_id); + sample_rate_ = codec_context_->sample_rate; + av_sample_format_ = codec_context_->sample_fmt; +@@ -223,7 +224,7 @@ bool AudioFileReader::OnNewFrame( + if (frames_read < 0) + return false; + +- const int channels = frame->channels; ++ const int channels = frame->ch_layout.nb_channels; + if (frame->sample_rate != sample_rate_ || channels != channels_ || + frame->format != av_sample_format_) { + DLOG(ERROR) << "Unsupported midstream configuration change!" +diff --git a/media/filters/ffmpeg_aac_bitstream_converter.cc b/media/filters/ffmpeg_aac_bitstream_converter.cc +index 6f231c85729..ca5e5fb927d 100644 +--- a/media/filters/ffmpeg_aac_bitstream_converter.cc ++++ b/media/filters/ffmpeg_aac_bitstream_converter.cc +@@ -195,14 +195,15 @@ bool FFmpegAACBitstreamConverter::ConvertPacket(AVPacket* packet) { + if (!header_generated_ || codec_ != stream_codec_parameters_->codec_id || + audio_profile_ != stream_codec_parameters_->profile || + sample_rate_index_ != sample_rate_index || +- channel_configuration_ != stream_codec_parameters_->channels || ++ channel_configuration_ != ++ stream_codec_parameters_->ch_layout.nb_channels || + frame_length_ != header_plus_packet_size) { + header_generated_ = + GenerateAdtsHeader(stream_codec_parameters_->codec_id, + 0, // layer + stream_codec_parameters_->profile, sample_rate_index, + 0, // private stream +- stream_codec_parameters_->channels, ++ stream_codec_parameters_->ch_layout.nb_channels, + 0, // originality + 0, // home + 0, // copyrighted_stream +@@ -214,7 +215,7 @@ bool FFmpegAACBitstreamConverter::ConvertPacket(AVPacket* packet) { + codec_ = stream_codec_parameters_->codec_id; + audio_profile_ = stream_codec_parameters_->profile; + sample_rate_index_ = sample_rate_index; +- channel_configuration_ = stream_codec_parameters_->channels; ++ channel_configuration_ = stream_codec_parameters_->ch_layout.nb_channels; + frame_length_ = header_plus_packet_size; + } + +diff --git a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc +index 1fd4c5ccd7d..f59bcd8fdaf 100644 +--- a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc ++++ b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc +@@ -34,7 +34,7 @@ class FFmpegAACBitstreamConverterTest : public testing::Test { + memset(&test_parameters_, 0, sizeof(AVCodecParameters)); + test_parameters_.codec_id = AV_CODEC_ID_AAC; + test_parameters_.profile = FF_PROFILE_AAC_MAIN; +- test_parameters_.channels = 2; ++ test_parameters_.ch_layout.nb_channels = 2; + test_parameters_.extradata = extradata_header_; + test_parameters_.extradata_size = sizeof(extradata_header_); + } +diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc +index 6a56c675f7d..4615fdeb3fb 100644 +--- a/media/filters/ffmpeg_audio_decoder.cc ++++ b/media/filters/ffmpeg_audio_decoder.cc +@@ -28,7 +28,7 @@ namespace media { + + // Return the number of channels from the data in |frame|. + static inline int DetermineChannels(AVFrame* frame) { +- return frame->channels; ++ return frame->ch_layout.nb_channels; + } + + // Called by FFmpeg's allocation routine to allocate a buffer. Uses +@@ -231,7 +231,7 @@ bool FFmpegAudioDecoder::OnNewFrame(const DecoderBuffer& buffer, + // Translate unsupported into discrete layouts for discrete configurations; + // ffmpeg does not have a labeled discrete configuration internally. + ChannelLayout channel_layout = ChannelLayoutToChromeChannelLayout( +- codec_context_->channel_layout, codec_context_->channels); ++ codec_context_->ch_layout.u.mask, codec_context_->ch_layout.nb_channels); + if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED && + config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE) { + channel_layout = CHANNEL_LAYOUT_DISCRETE; +@@ -348,11 +348,11 @@ bool FFmpegAudioDecoder::ConfigureDecoder(const AudioDecoderConfig& config) { + // Success! + av_sample_format_ = codec_context_->sample_fmt; + +- if (codec_context_->channels != config.channels()) { ++ if (codec_context_->ch_layout.nb_channels != config.channels()) { + MEDIA_LOG(ERROR, media_log_) + << "Audio configuration specified " << config.channels() + << " channels, but FFmpeg thinks the file contains " +- << codec_context_->channels << " channels"; ++ << codec_context_->ch_layout.nb_channels << " channels"; + ReleaseFFmpegResources(); + state_ = DecoderState::kUninitialized; + return false; +@@ -403,7 +403,7 @@ int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s, + if (frame->nb_samples <= 0) + return AVERROR(EINVAL); + +- if (s->channels != channels) { ++ if (s->ch_layout.nb_channels != channels) { + DLOG(ERROR) << "AVCodecContext and AVFrame disagree on channel count."; + return AVERROR(EINVAL); + } +@@ -436,7 +436,8 @@ int FFmpegAudioDecoder::GetAudioBuffer(struct AVCodecContext* s, + ChannelLayout channel_layout = + config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE + ? CHANNEL_LAYOUT_DISCRETE +- : ChannelLayoutToChromeChannelLayout(s->channel_layout, s->channels); ++ : ChannelLayoutToChromeChannelLayout(s->ch_layout.u.mask, ++ s->ch_layout.nb_channels); + + if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED) { + DLOG(ERROR) << "Unsupported channel layout."; +commit 62274859104bd828373ae406aa9309e610449ac5 +Author: Ted Meyer <tmathmeyer@chromium.org> +Date: Fri Mar 22 19:56:55 2024 +0000 + + Replace deprecated use of AVCodecContext::reordered_opaque + + We can use the AV_CODEC_FLAG_COPY_OPAQUE flag on the codec context + now to trigger timestamp propagation. + + Bug: 330573128 + Change-Id: I6bc57241a35ab5283742aad8d42acb4dc5e85858 + Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5384308 + Commit-Queue: Ted (Chromium) Meyer <tmathmeyer@chromium.org> + Reviewed-by: Dan Sanders <sandersd@chromium.org> + Cr-Commit-Position: refs/heads/main@{#1277051} + +diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc +index bd75477feeabb..8a658a58caac5 100644 +--- a/media/filters/ffmpeg_video_decoder.cc ++++ b/media/filters/ffmpeg_video_decoder.cc +@@ -134,7 +134,7 @@ bool FFmpegVideoDecoder::IsCodecSupported(VideoCodec codec) { + } + + FFmpegVideoDecoder::FFmpegVideoDecoder(MediaLog* media_log) +- : media_log_(media_log) { ++ : media_log_(media_log), timestamp_map_(128) { + DVLOG(1) << __func__; + DETACH_FROM_SEQUENCE(sequence_checker_); + } +@@ -363,8 +363,10 @@ bool FFmpegVideoDecoder::FFmpegDecode(const DecoderBuffer& buffer) { + DCHECK(packet->data); + DCHECK_GT(packet->size, 0); + +- // Let FFmpeg handle presentation timestamp reordering. +- codec_context_->reordered_opaque = buffer.timestamp().InMicroseconds(); ++ const int64_t timestamp = buffer.timestamp().InMicroseconds(); ++ const TimestampId timestamp_id = timestamp_id_generator_.GenerateNextId(); ++ timestamp_map_.Put(std::make_pair(timestamp_id, timestamp)); ++ packet->opaque = reinterpret_cast<void*>(timestamp_id.GetUnsafeValue()); + } + FFmpegDecodingLoop::DecodeStatus decode_status = decoding_loop_->DecodePacket( + packet, base::BindRepeating(&FFmpegVideoDecoder::OnNewFrame, +@@ -423,7 +425,12 @@ bool FFmpegVideoDecoder::OnNewFrame(AVFrame* frame) { + } + gfx::Size natural_size = aspect_ratio.GetNaturalSize(visible_rect); + +- const auto pts = base::Microseconds(frame->reordered_opaque); ++ const auto ts_id = TimestampId(reinterpret_cast<size_t>(frame->opaque)); ++ const auto ts_lookup = timestamp_map_.Get(ts_id); ++ if (ts_lookup == timestamp_map_.end()) { ++ return false; ++ } ++ const auto pts = base::Microseconds(std::get<1>(*ts_lookup)); + auto video_frame = VideoFrame::WrapExternalDataWithLayout( + opaque->layout, visible_rect, natural_size, opaque->data, opaque->size, + pts); +@@ -498,8 +505,10 @@ bool FFmpegVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config, + codec_context_->thread_count = GetFFmpegVideoDecoderThreadCount(config); + codec_context_->thread_type = + FF_THREAD_SLICE | (low_delay ? 0 : FF_THREAD_FRAME); ++ + codec_context_->opaque = this; + codec_context_->get_buffer2 = GetVideoBufferImpl; ++ codec_context_->flags |= AV_CODEC_FLAG_COPY_OPAQUE; + + if (base::FeatureList::IsEnabled(kFFmpegAllowLists)) { + // Note: FFmpeg will try to free this string, so we must duplicate it. +diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h +index d02cb89c3ddf7..0a2de1c623fff 100644 +--- a/media/filters/ffmpeg_video_decoder.h ++++ b/media/filters/ffmpeg_video_decoder.h +@@ -7,10 +7,12 @@ + + #include <memory> + ++#include "base/containers/lru_cache.h" + #include "base/functional/callback.h" + #include "base/memory/raw_ptr.h" + #include "base/memory/scoped_refptr.h" + #include "base/sequence_checker.h" ++#include "base/types/id_type.h" + #include "media/base/supported_video_decoder_config.h" + #include "media/base/video_decoder.h" + #include "media/base/video_decoder_config.h" +@@ -87,6 +89,20 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder { + // FFmpeg structures owned by this object. + std::unique_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_; + ++ // The gist here is that timestamps need to be 64 bits to store microsecond ++ // precision. A 32 bit integer would overflow at ~35 minutes at this level of ++ // precision. We can't cast the timestamp to the void ptr object used by the ++ // opaque field in ffmpeg then, because it would lose data on a 32 bit build. ++ // However, we don't actually have 2^31 timestamped frames in a single ++ // playback, so it's fine to use the 32 bit value as a key in a map which ++ // contains the actual timestamps. Additionally, we've in the past set 128 ++ // outstanding frames for re-ordering as a limit for cross-thread decoding ++ // tasks, so we'll do that here too with the LRU cache. ++ using TimestampId = base::IdType<int64_t, size_t, 0>; ++ ++ TimestampId::Generator timestamp_id_generator_; ++ base::LRUCache<TimestampId, int64_t> timestamp_map_; ++ + VideoDecoderConfig config_; + + scoped_refptr<FrameBufferPool> frame_pool_; +diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc +index 3331581a6fee6..69539fd6594ec 100644 +--- a/media/ffmpeg/ffmpeg_common.cc ++++ b/media/ffmpeg/ffmpeg_common.cc +@@ -404,7 +404,9 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context, + + // TODO(dalecurtis): Just use the profile from the codec context if ffmpeg + // ever starts supporting xHE-AAC. +- if (codec_context->profile == FF_PROFILE_UNKNOWN) { ++ constexpr uint8_t kXHEAAc = 41; ++ if (codec_context->profile == FF_PROFILE_UNKNOWN || ++ codec_context->profile == kXHEAAc) { + // Errors aren't fatal here, so just drop any MediaLog messages. + NullMediaLog media_log; + mp4::AAC aac_parser; +diff --git a/media/ffmpeg/ffmpeg_regression_tests.cc b/media/ffmpeg/ffmpeg_regression_tests.cc +index 05dcb1cd62c75..866f446698947 100644 +--- a/media/ffmpeg/ffmpeg_regression_tests.cc ++++ b/media/ffmpeg/ffmpeg_regression_tests.cc +@@ -90,16 +90,16 @@ FFMPEG_TEST_CASE(Cr62127, + PIPELINE_ERROR_DECODE, + PIPELINE_ERROR_DECODE); + FFMPEG_TEST_CASE(Cr93620, "security/93620.ogg", PIPELINE_OK, PIPELINE_OK); +-FFMPEG_TEST_CASE(Cr100492, +- "security/100492.webm", +- DECODER_ERROR_NOT_SUPPORTED, +- DECODER_ERROR_NOT_SUPPORTED); ++FFMPEG_TEST_CASE(Cr100492, "security/100492.webm", PIPELINE_OK, PIPELINE_OK); + FFMPEG_TEST_CASE(Cr100543, "security/100543.webm", PIPELINE_OK, PIPELINE_OK); + FFMPEG_TEST_CASE(Cr101458, + "security/101458.webm", + PIPELINE_ERROR_DECODE, + PIPELINE_ERROR_DECODE); +-FFMPEG_TEST_CASE(Cr108416, "security/108416.webm", PIPELINE_OK, PIPELINE_OK); ++FFMPEG_TEST_CASE(Cr108416, ++ "security/108416.webm", ++ PIPELINE_ERROR_DECODE, ++ PIPELINE_ERROR_DECODE); + FFMPEG_TEST_CASE(Cr110849, + "security/110849.mkv", + DEMUXER_ERROR_COULD_NOT_OPEN, +@@ -154,7 +154,10 @@ FFMPEG_TEST_CASE(Cr234630b, + "security/234630b.mov", + DEMUXER_ERROR_NO_SUPPORTED_STREAMS, + DEMUXER_ERROR_NO_SUPPORTED_STREAMS); +-FFMPEG_TEST_CASE(Cr242786, "security/242786.webm", PIPELINE_OK, PIPELINE_OK); ++FFMPEG_TEST_CASE(Cr242786, ++ "security/242786.webm", ++ PIPELINE_OK, ++ PIPELINE_ERROR_DECODE); + // Test for out-of-bounds access with slightly corrupt file (detection logic + // thinks it's a MONO file, but actually contains STEREO audio). + FFMPEG_TEST_CASE(Cr275590, +@@ -372,8 +375,8 @@ FFMPEG_TEST_CASE(WEBM_2, + DEMUXER_ERROR_NO_SUPPORTED_STREAMS); + FFMPEG_TEST_CASE(WEBM_4, + "security/out.webm.68798.1929", +- DECODER_ERROR_NOT_SUPPORTED, +- DECODER_ERROR_NOT_SUPPORTED); ++ PIPELINE_OK, ++ PIPELINE_OK); + FFMPEG_TEST_CASE(WEBM_5, "frame_size_change.webm", PIPELINE_OK, PIPELINE_OK); + + // General MKV test cases. +diff --git a/media/filters/audio_decoder_unittest.cc b/media/filters/audio_decoder_unittest.cc +index a31823cfe3b58..e43f408b79e5c 100644 +--- a/media/filters/audio_decoder_unittest.cc ++++ b/media/filters/audio_decoder_unittest.cc +@@ -484,7 +484,7 @@ constexpr TestParams kXheAacTestParams[] = { + }}, + 0, + 29400, +- CHANNEL_LAYOUT_MONO, ++ CHANNEL_LAYOUT_UNSUPPORTED, + AudioCodecProfile::kXHE_AAC}, + #endif + {AudioCodec::kAAC, +diff --git a/media/filters/audio_file_reader_unittest.cc b/media/filters/audio_file_reader_unittest.cc +index c0cc568d63019..edf9470f2f8b3 100644 +--- a/media/filters/audio_file_reader_unittest.cc ++++ b/media/filters/audio_file_reader_unittest.cc +@@ -62,15 +62,14 @@ class AudioFileReaderTest : public testing::Test { + // Verify packets are consistent across demuxer runs. Reads the first few + // packets and then seeks back to the start timestamp and verifies that the + // hashes match on the packets just read. +- void VerifyPackets() { +- const int kReads = 3; ++ void VerifyPackets(int packet_reads) { + const int kTestPasses = 2; + + AVPacket packet; + base::TimeDelta start_timestamp; + std::vector<std::string> packet_md5_hashes_; + for (int i = 0; i < kTestPasses; ++i) { +- for (int j = 0; j < kReads; ++j) { ++ for (int j = 0; j < packet_reads; ++j) { + ASSERT_TRUE(reader_->ReadPacketForTesting(&packet)); + + // On the first pass save the MD5 hash of each packet, on subsequent +@@ -99,7 +98,8 @@ class AudioFileReaderTest : public testing::Test { + int sample_rate, + base::TimeDelta duration, + int frames, +- int expected_frames) { ++ int expected_frames, ++ int packet_reads = 3) { + Initialize(fn); + ASSERT_TRUE(reader_->Open()); + EXPECT_EQ(channels, reader_->channels()); +@@ -113,7 +113,7 @@ class AudioFileReaderTest : public testing::Test { + EXPECT_EQ(reader_->HasKnownDuration(), false); + } + if (!packet_verification_disabled_) +- ASSERT_NO_FATAL_FAILURE(VerifyPackets()); ++ ASSERT_NO_FATAL_FAILURE(VerifyPackets(packet_reads)); + ReadAndVerify(hash, expected_frames); + } + +@@ -220,7 +220,7 @@ TEST_F(AudioFileReaderTest, AAC_ADTS) { + } + + TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) { +- RunTestFailingDecode("midstream_config_change.mp3", 42624); ++ RunTestFailingDecode("midstream_config_change.mp3", 0); + } + #endif + +@@ -230,7 +230,7 @@ TEST_F(AudioFileReaderTest, VorbisInvalidChannelLayout) { + + TEST_F(AudioFileReaderTest, WaveValidFourChannelLayout) { + RunTest("4ch.wav", "131.71,38.02,130.31,44.89,135.98,42.52,", 4, 44100, +- base::Microseconds(100001), 4411, 4410); ++ base::Microseconds(100001), 4411, 4410, /*packet_reads=*/2); + } + + TEST_F(AudioFileReaderTest, ReadPartialMP3) { +diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc +index 8a658a58caac5..9d6ed8aeb5c48 100644 +--- a/media/filters/ffmpeg_video_decoder.cc ++++ b/media/filters/ffmpeg_video_decoder.cc +@@ -213,10 +213,6 @@ int FFmpegVideoDecoder::GetVideoBuffer(struct AVCodecContext* codec_context, + frame->linesize[plane] = layout->planes()[plane].stride; + } + +- // This seems unsafe, given threaded decoding. However, `reordered_opaque` is +- // also going away upstream, so we need a whole new mechanism either way. +- frame->reordered_opaque = codec_context->reordered_opaque; +- + // This will be freed by `ReleaseVideoBufferImpl`. + auto* opaque = new OpaqueData(fb_priv, frame_pool_, data, allocation_size, + std::move(*layout)); +diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc +index e1be5aa9a5b13..951c003956fb5 100644 +--- a/media/filters/audio_file_reader.cc ++++ b/media/filters/audio_file_reader.cc +@@ -243,18 +243,10 @@ bool AudioFileReader::OnNewFrame( + // silence from being output. In the case where we are also discarding some + // portion of the packet (as indicated by a negative pts), we further want to + // adjust the duration downward by however much exists before zero. +-#if BUILDFLAG(USE_SYSTEM_FFMPEG) +- if (audio_codec_ == AudioCodec::kAAC && frame->pkt_duration) { +-#else + if (audio_codec_ == AudioCodec::kAAC && frame->duration) { +-#endif // BUILDFLAG(USE_SYSTEM_FFMPEG) + const base::TimeDelta pkt_duration = ConvertFromTimeBase( + glue_->format_context()->streams[stream_index_]->time_base, +-#if BUILDFLAG(USE_SYSTEM_FFMPEG) +- frame->pkt_duration + std::min(static_cast<int64_t>(0), frame->pts)); +-#else + frame->duration + std::min(static_cast<int64_t>(0), frame->pts)); +-#endif // BUILDFLAG(USE_SYSTEM_FFMPEG) + const base::TimeDelta frame_duration = + base::Seconds(frames_read / static_cast<double>(sample_rate_)); + +diff --git a/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc +index c6446c2..805b95b 100644 +--- a/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc ++++ b/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc +@@ -233,7 +233,6 @@ + int total_size = y_size + 2 * uv_size; + + av_frame->format = context->pix_fmt; +- av_frame->reordered_opaque = context->reordered_opaque; + + // Create a VideoFrame object, to keep a reference to the buffer. + // TODO(nisse): The VideoFrame's timestamp and rotation info is not used. +@@ -381,8 +380,6 @@ + return WEBRTC_VIDEO_CODEC_ERROR; + } + packet->size = static_cast<int>(input_image.size()); +- int64_t frame_timestamp_us = input_image.ntp_time_ms_ * 1000; // ms -> μs +- av_context_->reordered_opaque = frame_timestamp_us; + + int result = avcodec_send_packet(av_context_.get(), packet.get()); + +@@ -399,10 +396,6 @@ + return WEBRTC_VIDEO_CODEC_ERROR; + } + +- // We don't expect reordering. Decoded frame timestamp should match +- // the input one. +- RTC_DCHECK_EQ(av_frame_->reordered_opaque, frame_timestamp_us); +- + // TODO(sakal): Maybe it is possible to get QP directly from FFmpeg. + h264_bitstream_parser_.ParseBitstream(input_image); + absl::optional<int> qp = h264_bitstream_parser_.GetLastSliceQp(); diff --git a/source/l/qt6/qt6.SlackBuild b/source/l/qt6/qt6.SlackBuild index f40431fc8..37795252c 100755 --- a/source/l/qt6/qt6.SlackBuild +++ b/source/l/qt6/qt6.SlackBuild @@ -32,7 +32,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt6 VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BUILD=${BUILD:-1} +BUILD=${BUILD:-6} PKGSRC=$(echo $VERSION | cut -d - -f 1) PKGVER=$(echo $VERSION | tr - _) @@ -42,7 +42,7 @@ SYSTEM_FFMPEG=${SYSTEM_FFMPEG:-YES} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -58,40 +58,41 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +# Since this could be needed twice... +OPTS32="-O2 -march=pentium4 -mtune=generic" + +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="$OPTS32" SLKLDFLAGS="" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" SLKLDFLAGS="-L/usr/lib64" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - # To prevent "qatomic_armv6.h error: output number 2 not directly addressable" - # More permanent solution is to patch gcc: - # http://bazaar.launchpad.net/~linaro-toolchain-dev/gcc-linaro/4.6/revision/106731 - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fno-strict-volatile-bitfields" - SLKLDFLAGS="" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" SLKLDFLAGS="" LIBDIRSUFFIX="" fi +# GCC 14 "fix": +# It seems this flag doesn't carry through to qtwebengine where most of the +# warnings are, but we'll leave it here anyway. +SLKCFLAGS="$SLKCFLAGS -Wno-error=template-id-cdtor" + case "$ARCH" in arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; *) TARGET=$ARCH-slackware-linux ;; esac +# For cross-compiling from x86_64: +if [ "$(uname -m)" = "x86_64" -a "$(file -L /usr/bin/gcc | grep 80386 | grep 32-bit)" != "" ]; then + ARCH=i686 + SLKCFLAGS="$OPTS32" + SLKLDFLAGS="" + LIBDIRSUFFIX="" +fi + NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} NINJAJOBS=${NINJAJOBS:-"$(echo $NUMJOBS | cut -f 2 -d j | tr -d ' ')"} export NINJAJOBS @@ -147,14 +148,31 @@ pushd qtwebengine popd cat $CWD/patches/nodejs-allow-32bit.patch | patch -p1 --verbose || exit 1 -# GCC13 requires this include: -cat $CWD/patches/qt6-3d_gcc13.patch | patch -p0 --verbose || exit 1 +# Patch header issue that causes the compile to fail with "x11 not defined" +pushd qtwebengine + cat $CWD/patches/qtwebengine-6.7.0-displaykey-header.patch | patch -p1 --verbose || exit 1 +popd + +# Fix build with ffmpeg-7: +pushd qtwebengine/src/3rdparty/chromium + cat $CWD/patches/qtwebengine-ffmpeg-7.patch | patch -p1 --verbose || exit 1 +popd + +# Fix for building with recent ninja: +pushd qtwebengine + cat $CWD/patches/qtwebengine-6.7.0-ninja1.12.patch | patch -p1 --verbose || exit 1 +popd + +# Upstream crash fix (coming officially in 6.7.3): +pushd qtwayland + cat $CWD/patches/92bcb8f6b7a852c7a5d662fc34de561692a7a454.patch | patch -p1 --verbose || exit 1 +popd # Previously we didn't have a protobuf package in Slackware. # Now that we do, it's apparently too new to use with Qt6, so let's just # disable it to get the same features that we previously did. # Patches would be accepted here. :-) -PROTOBUF="-DQT_FEATURE_qtprotobufgen=OFF" +#PROTOBUF="-DQT_FEATURE_qtprotobufgen=OFF" # The qtquick3dphysics only compiles on a limited set of architectures: case "${ARCH}" in @@ -191,7 +209,7 @@ cmake -S $(pwd) -B build-${PKGNAM} \ -DINSTALL_ARCHDATADIR=/usr/lib${LIBDIRSUFFIX}/qt6 \ -DINSTALL_DATADIR=/usr/share/qt6 \ -DINSTALL_INCLUDEDIR=/usr/include/qt6 \ - -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \ + -DINSTALL_MKSPECSDIR=lib${LIBDIRSUFFIX}/qt6/mkspecs \ -DINSTALL_DOCDIR=/usr/doc/qt6-${PKGVER} \ -DINSTALL_EXAMPLESDIR=/usr/doc/qt6-${PKGVER}/examples \ -DFEATURE_libproxy=ON \ diff --git a/source/l/readline/readline-8.2-patches/readline82-011 b/source/l/readline/readline-8.2-patches/readline82-011 new file mode 100644 index 000000000..3ad7a8ffd --- /dev/null +++ b/source/l/readline/readline-8.2-patches/readline82-011 @@ -0,0 +1,75 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 8.2 +Patch-ID: readline82-011 + +Bug-Reported-by: Grisha Levit <grishalevit@gmail.com> +Bug-Reference-ID: <CAMu=BrqWa_iNkiEwchpFmtrUhFrAanOO8pjy7VCKqRKUvqdsbw@mail.gmail.com> +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2024-02/msg00075.html + +Bug-Description: + +Patch (apply with `patch -p0'): + +Some systems (e.g., macOS) send signals early on in interactive initialization, +so readline should retry a failed open of the init file. + +*** ../readline-8.2-patched/bind.c Wed Feb 9 11:02:22 2022 +--- bind.c Tue Apr 23 15:07:13 2024 +*************** +*** 979,987 **** + int i, file; + +! file = -1; +! if (((file = open (filename, O_RDONLY, 0666)) < 0) || (fstat (file, &finfo) < 0)) + { + if (file >= 0) + close (file); + return ((char *)NULL); + } +--- 969,986 ---- + int i, file; + +! file = open (filename, O_RDONLY, 0666); +! /* If the open is interrupted, retry once */ +! if (file < 0 && errno == EINTR) + { ++ RL_CHECK_SIGNALS (); ++ file = open (filename, O_RDONLY, 0666); ++ } ++ ++ if ((file < 0) || (fstat (file, &finfo) < 0)) ++ { ++ i = errno; + if (file >= 0) + close (file); ++ errno = i; + return ((char *)NULL); + } +*************** +*** 992,999 **** +--- 991,1001 ---- + if (file_size != finfo.st_size || file_size + 1 < file_size) + { ++ i = errno; + if (file >= 0) + close (file); + #if defined (EFBIG) + errno = EFBIG; ++ #else ++ errno = i; + #endif + return ((char *)NULL); + +*** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 10 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 11 diff --git a/source/l/readline/readline-8.2-patches/readline82-012 b/source/l/readline/readline-8.2-patches/readline82-012 new file mode 100644 index 000000000..cbcb4cdaf --- /dev/null +++ b/source/l/readline/readline-8.2-patches/readline82-012 @@ -0,0 +1,93 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 8.2 +Patch-ID: readline82-012 + +Bug-Reported-by: Grisha Levit <grishalevit@gmail.com> +Bug-Reference-ID: <CAMu=BroaH+41uumYt89FPqt8Fsatj-d6mZzmPV2HZYjtcbvbvw@mail.gmail.com> +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2023-11/msg00019.html + +Bug-Description: + +If a user happens to bind do-lowercase-version to something that isn't a +capital letter, so _rl_to_lower doesn't change anything and the result is +still bound to do-lowercase-version, readline can recurse infinitely. + +Patch (apply with `patch -p0'): + +*** ../readline-8.2-patched/readline.c Thu Aug 11 18:35:37 2022 +--- readline.c Fri Feb 2 12:05:36 2024 +*************** +*** 900,905 **** + /* Special case rl_do_lowercase_version (). */ + if (func == rl_do_lowercase_version) +! /* Should we do anything special if key == ANYOTHERKEY? */ +! return (_rl_dispatch (_rl_to_lower ((unsigned char)key), map)); + + rl_executing_keymap = map; +--- 912,926 ---- + /* Special case rl_do_lowercase_version (). */ + if (func == rl_do_lowercase_version) +! { +! /* Should we do anything special if key == ANYOTHERKEY? */ +! newkey = _rl_to_lower ((unsigned char)key); +! if (newkey != key) +! return (_rl_dispatch (newkey, map)); +! else +! { +! rl_ding (); /* gentle failure */ +! return 0; +! } +! } + + rl_executing_keymap = map; +*************** +*** 1110,1114 **** + func = m[ANYOTHERKEY].function; + if (type == ISFUNC && func == rl_do_lowercase_version) +! r = _rl_dispatch (_rl_to_lower ((unsigned char)key), map); + else if (type == ISFUNC) + { +--- 1131,1139 ---- + func = m[ANYOTHERKEY].function; + if (type == ISFUNC && func == rl_do_lowercase_version) +! { +! int newkey = _rl_to_lower ((unsigned char)key); +! /* check that there is actually a lowercase version to avoid infinite recursion */ +! r = (newkey != key) ? _rl_dispatch (newkey, map) : 1; +! } + else if (type == ISFUNC) + { + +*** ../readline-8.2-patched/isearch.c Thu Aug 11 18:35:37 2022 +--- isearch.c Fri Feb 2 12:05:36 2024 +*************** +*** 429,433 **** + f = cxt->keymap[c].function; + if (f == rl_do_lowercase_version) +! f = cxt->keymap[_rl_to_lower (c)].function; + } + +--- 431,439 ---- + f = cxt->keymap[c].function; + if (f == rl_do_lowercase_version) +! { +! f = cxt->keymap[_rl_to_lower (c)].function; +! if (f == rl_do_lowercase_version) +! f = rl_insert; +! } + } + + +*** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 11 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 12 diff --git a/source/l/readline/readline-8.2-patches/readline82-013 b/source/l/readline/readline-8.2-patches/readline82-013 new file mode 100644 index 000000000..cb4164fbe --- /dev/null +++ b/source/l/readline/readline-8.2-patches/readline82-013 @@ -0,0 +1,234 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 8.2 +Patch-ID: readline82-013 + +Bug-Reported-by: Grisha Levit <grishalevit@gmail.com> +Bug-Reference-ID: <CAMu=Brrv5qKY6LPfw8PxqNXNO8rNsZo0Fb=BcFb-uHObWPqnrw@mail.gmail. +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2023-04/msg00082.html + +Bug-Description: + +When readline is accumulating bytes until it reads a complete multibyte +character, reading a byte that makes the multibyte character invalid can +result in discarding the bytes in the partial character. + +Patch (apply with `patch -p0'): + +*** ../readline-8.2-patched/text.c Mon May 1 09:37:52 2023 +--- text.c Mon May 29 12:22:29 2023 +*************** +*** 86,90 **** + rl_insert_text (const char *string) + { +! register int i, l; + + l = (string && *string) ? strlen (string) : 0; +--- 86,91 ---- + rl_insert_text (const char *string) + { +! register int i; +! size_t l; + + l = (string && *string) ? strlen (string) : 0; +*************** +*** 705,709 **** + /* Insert the character C at the current location, moving point forward. + If C introduces a multibyte sequence, we read the whole sequence and +! then insert the multibyte char into the line buffer. */ + int + _rl_insert_char (int count, int c) +--- 706,714 ---- + /* Insert the character C at the current location, moving point forward. + If C introduces a multibyte sequence, we read the whole sequence and +! then insert the multibyte char into the line buffer. +! If C == 0, we immediately insert any pending partial multibyte character, +! assuming that we have read a character that doesn't map to self-insert. +! This doesn't completely handle characters that are part of a multibyte +! character but map to editing functions. */ + int + _rl_insert_char (int count, int c) +*************** +*** 719,727 **** + #endif + + if (count <= 0) + return 0; + +! #if defined (HANDLE_MULTIBYTE) +! if (MB_CUR_MAX == 1 || rl_byte_oriented) + { + incoming[0] = c; +--- 724,749 ---- + #endif + ++ #if !defined (HANDLE_MULTIBYTE) + if (count <= 0) + return 0; ++ #else ++ if (count < 0) ++ return 0; ++ if (count == 0) ++ { ++ if (pending_bytes_length == 0) ++ return 0; ++ if (stored_count <= 0) ++ stored_count = count; ++ else ++ count = stored_count; + +! memcpy (incoming, pending_bytes, pending_bytes_length); +! incoming[pending_bytes_length] = '\0'; +! incoming_length = pending_bytes_length; +! pending_bytes_length = 0; +! memset (&ps, 0, sizeof (mbstate_t)); +! } +! else if (MB_CUR_MAX == 1 || rl_byte_oriented) + { + incoming[0] = c; +*************** +*** 731,734 **** +--- 753,759 ---- + else if (_rl_utf8locale && (c & 0x80) == 0) + { ++ if (pending_bytes_length) ++ _rl_insert_char (0, 0); ++ + incoming[0] = c; + incoming[1] = '\0'; +*************** +*** 765,769 **** + incoming_length = 1; + pending_bytes_length--; +! memmove (pending_bytes, pending_bytes + 1, pending_bytes_length); + /* Clear the state of the byte sequence, because in this case the + effect of mbstate is undefined. */ +--- 790,795 ---- + incoming_length = 1; + pending_bytes_length--; +! if (pending_bytes_length) +! memmove (pending_bytes, pending_bytes + 1, pending_bytes_length); + /* Clear the state of the byte sequence, because in this case the + effect of mbstate is undefined. */ +*************** +*** 828,832 **** +--- 854,862 ---- + xfree (string); + ++ #if defined (HANDLE_MULTIBYTE) ++ return (pending_bytes_length != 0); ++ #else + return 0; ++ #endif + } + +*************** +*** 861,864 **** +--- 891,896 ---- + incoming_length = 0; + stored_count = 0; ++ ++ return (pending_bytes_length != 0); + #else /* !HANDLE_MULTIBYTE */ + char str[TEXT_COUNT_MAX+1]; +*************** +*** 874,880 **** + count -= decreaser; + } +- #endif /* !HANDLE_MULTIBYTE */ + + return 0; + } + +--- 906,912 ---- + count -= decreaser; + } + + return 0; ++ #endif /* !HANDLE_MULTIBYTE */ + } + +*************** +*** 904,910 **** + stored_count = 0; + } +! #endif +! + return 0; + } + +--- 936,944 ---- + stored_count = 0; + } +! +! return (pending_bytes_length != 0); +! #else + return 0; ++ #endif + } + +*************** +*** 984,987 **** +--- 1018,1026 ---- + } + ++ /* If we didn't insert n and there are pending bytes, we need to insert ++ them if _rl_insert_char didn't do that on its own. */ ++ if (r == 1 && rl_insert_mode == RL_IM_INSERT) ++ r = _rl_insert_char (0, 0); /* flush partial multibyte char */ ++ + if (n != (unsigned short)-2) /* -2 = sentinel value for having inserted N */ + { +*************** +*** 1055,1058 **** +--- 1094,1099 ---- + rl_quoted_insert (int count, int key) + { ++ int r; ++ + /* Let's see...should the callback interface futz with signal handling? */ + #if defined (HANDLE_SIGNALS) +*************** +*** 1073,1085 **** + if (count < 0) + { +- int r; +- + do + r = _rl_insert_next (1); + while (r == 0 && ++count < 0); +- return r; + } + +! return _rl_insert_next (count); + } + +--- 1114,1128 ---- + if (count < 0) + { + do + r = _rl_insert_next (1); + while (r == 0 && ++count < 0); + } ++ else ++ r = _rl_insert_next (count); + +! if (r == 1) +! _rl_insert_char (0, 0); /* insert partial multibyte character */ +! +! return r; + } + + +*** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 12 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 13 diff --git a/source/l/readline/readline.SlackBuild b/source/l/readline/readline.SlackBuild index 9f1e1f124..2b3971997 100755 --- a/source/l/readline/readline.SlackBuild +++ b/source/l/readline/readline.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -41,14 +41,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-readline -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -109,7 +106,7 @@ make install DESTDIR=$PKG || exit 1 # NOTE: This will link against the currently installed libreadline! # Build/install this package twice whenever there is an .soname bump. ( cd examples/rlfe || exit 1 - CFLAGS="$SLKCFLAGS" \ + CFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=int-conversion" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/source/l/sdl/sdl.SlackBuild b/source/l/sdl/sdl.SlackBuild index cbbedaf3e..95011b741 100755 --- a/source/l/sdl/sdl.SlackBuild +++ b/source/l/sdl/sdl.SlackBuild @@ -66,6 +66,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration" + TMP=${TMP:-/tmp} PKG=$TMP/package-sdl diff --git a/source/l/sip/sip.SlackBuild b/source/l/sip/sip.SlackBuild index 922c884dc..1dad0264b 100755 --- a/source/l/sip/sip.SlackBuild +++ b/source/l/sip/sip.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2008 Aleksandar Samardzic <asamardzic@gmail.com> -# Copyright 2008, 2009, 2010, 2011, 2017, 2018, 2019, 2023 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2017, 2018, 2019, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,14 +28,14 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sip VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -54,9 +54,9 @@ fi if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" elif [ "$ARCH" = "armv7hl" ]; then SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" else @@ -89,7 +89,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - LICENSE* COPYING* ChangeLog NEWS README TODO doc/* \ + LICENSE* COPYING* ChangeLog NEWS* PKG-INFO* README* TODO \ $PKG/usr/doc/$PKGNAM-$VERSION chown -R root:root $PKG/usr/doc diff --git a/source/l/slang1/slang1.SlackBuild b/source/l/slang1/slang1.SlackBuild index 97ae70c94..b90daf181 100755 --- a/source/l/slang1/slang1.SlackBuild +++ b/source/l/slang1/slang1.SlackBuild @@ -61,6 +61,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int" + TMP=${TMP:-/tmp} PKG=$TMP/package-slang1 rm -rf $PKG @@ -83,7 +86,7 @@ CFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --includedir=/usr/include/slang1 \ --disable-static \ - $ARCH-slackware-linux + $ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/sof-firmware/sof-firmware.url b/source/l/sof-firmware/sof-firmware.url index f7ff05b76..889e74657 100644 --- a/source/l/sof-firmware/sof-firmware.url +++ b/source/l/sof-firmware/sof-firmware.url @@ -1,2 +1,2 @@ -https://github.com/thesofproject/sof-bin/releases -https://github.com/thesofproject/sof-bin/releases/download/v2023.12.1/sof-bin-2023.12.1.tar.gz +https://github.com/thesofproject/sof-bin +https://github.com/thesofproject/sof-bin/releases/download/v2024.06/sof-bin-2024.06.tar.gz diff --git a/source/l/speech-dispatcher/speech-dispatcher.SlackBuild b/source/l/speech-dispatcher/speech-dispatcher.SlackBuild index f3321531b..0c36258fb 100755 --- a/source/l/speech-dispatcher/speech-dispatcher.SlackBuild +++ b/source/l/speech-dispatcher/speech-dispatcher.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=speech-dispatcher SRCNAM=speech-dispatcher VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/l/spirv-llvm-translator/spirv-llvm-translator.SlackBuild b/source/l/spirv-llvm-translator/spirv-llvm-translator.SlackBuild index a4c6b3249..7db4068a0 100755 --- a/source/l/spirv-llvm-translator/spirv-llvm-translator.SlackBuild +++ b/source/l/spirv-llvm-translator/spirv-llvm-translator.SlackBuild @@ -32,7 +32,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; armv7hl) export ARCH=$MARCH ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: @@ -48,18 +48,12 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/svgalib/svgalib.SlackBuild b/source/l/svgalib/svgalib.SlackBuild index 880c7c6bd..e83392096 100755 --- a/source/l/svgalib/svgalib.SlackBuild +++ b/source/l/svgalib/svgalib.SlackBuild @@ -58,6 +58,12 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=return-mismatch" + +# From the Makefile.cfg: +SLKCFLAGS="$SLKCFLAGS -fomit-frame-pointer -O2 -fno-strength-reduce -pipe" + TMP=${TMP:-/tmp} PKG=$TMP/package-svgalib rm -rf $PKG @@ -92,6 +98,7 @@ zcat $CWD/svgalib-1.9.25-quickmath-h-redefinitions.patch.gz | patch -p1 --verbos zcat $CWD/svgalib-1.9.21-demos.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/svgalib-1.9.25.no_asm.patch.gz | patch -p1 --verbose || exit 1 +export CFLAGS="$SLKCFLAGS" # Build and install - spamming your partition first...: make install NO_HELPER=y || exit 1 make install \ diff --git a/source/l/system-config-printer/system-config-printer.SlackBuild b/source/l/system-config-printer/system-config-printer.SlackBuild index c8782bafa..948b5f5f3 100755 --- a/source/l/system-config-printer/system-config-printer.SlackBuild +++ b/source/l/system-config-printer/system-config-printer.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=system-config-printer VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/t1lib/t1lib.SlackBuild b/source/l/t1lib/t1lib.SlackBuild index ae7ade14c..ad5ff3266 100755 --- a/source/l/t1lib/t1lib.SlackBuild +++ b/source/l/t1lib/t1lib.SlackBuild @@ -55,6 +55,9 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int" + NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} diff --git a/source/l/talloc/talloc.SlackBuild b/source/l/talloc/talloc.SlackBuild index 39da12b4c..b03599a4f 100755 --- a/source/l/talloc/talloc.SlackBuild +++ b/source/l/talloc/talloc.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=talloc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/tdb/tdb.SlackBuild b/source/l/tdb/tdb.SlackBuild index ba013f8bd..2e15ccc3a 100755 --- a/source/l/tdb/tdb.SlackBuild +++ b/source/l/tdb/tdb.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -47,21 +47,12 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/tevent/tevent.SlackBuild b/source/l/tevent/tevent.SlackBuild index 514d01398..877156b16 100755 --- a/source/l/tevent/tevent.SlackBuild +++ b/source/l/tevent/tevent.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=tevent VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/unicode-ucd/fetch-sources.sh b/source/l/unicode-ucd/fetch-sources.sh index c02a4ad07..ac6e9d0e6 100755 --- a/source/l/unicode-ucd/fetch-sources.sh +++ b/source/l/unicode-ucd/fetch-sources.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=${VERSION:-15.1.0} +VERSION=${VERSION:-16.0.0} rm -f UCD*.zip Unihan*.zip license.txt lftpget https://www.unicode.org/Public/zipped/$VERSION/UCD.zip diff --git a/source/l/v4l-utils/v4l-utils.SlackBuild b/source/l/v4l-utils/v4l-utils.SlackBuild index d16451a68..6b3d86a12 100755 --- a/source/l/v4l-utils/v4l-utils.SlackBuild +++ b/source/l/v4l-utils/v4l-utils.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2009 Eric Hameleers, Eindhoven, NL -# Copyright 2009, 2010, 2011, 2013, 2018, 2020, 2023 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2011, 2013, 2018, 2020, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # Redistribution and use of this script, with or without modification, is @@ -32,7 +32,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -50,14 +50,11 @@ fi TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -101,12 +98,16 @@ meson setup \ --buildtype=release \ -Ddoxygen-doc=disabled \ -Ddoxygen-html=false \ + -Dgconv=disabled \ .. || exit 1 "${NINJA:=ninja}" $NUMJOBS || exit 1 DESTDIR=$PKG $NINJA install || exit 1 cd .. # DO NOT overwrite gconv-modules from glibc! +# Yeah, I think we'll just disable these above since I'm not aware of +# any important reason for the gconv modules anyway. +# If I'm wrong, let me know. if [ -r $PKG/usr/lib${LIBDIRSUFFIX}/gconv/gconv-modules ]; then mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/gconv/gconv-modules.d mv $PKG/usr/lib${LIBDIRSUFFIX}/gconv/gconv-modules $PKG/usr/lib${LIBDIRSUFFIX}/gconv/gconv-modules.d/v4l-utils.conf diff --git a/source/l/vte/vte.SlackBuild b/source/l/vte/vte.SlackBuild index e3b156cb7..da387a18a 100755 --- a/source/l/vte/vte.SlackBuild +++ b/source/l/vte/vte.SlackBuild @@ -31,7 +31,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -46,14 +46,11 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/source/l/vte/vte.url b/source/l/vte/vte.url index b9a7d0ce2..4dd14b4cf 100644 --- a/source/l/vte/vte.url +++ b/source/l/vte/vte.url @@ -1 +1,2 @@ https://gitlab.gnome.org/GNOME/vte +https://gitlab.gnome.org/GNOME/vte/-/archive/0.78.0/vte-0.78.0.tar.gz diff --git a/source/l/wireplumber/wireplumber.SlackBuild b/source/l/wireplumber/wireplumber.SlackBuild index 59806c8ea..e3a9ce4a5 100755 --- a/source/l/wireplumber/wireplumber.SlackBuild +++ b/source/l/wireplumber/wireplumber.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i586 ;; + i?86) ARCH=i686 ;; arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -48,21 +48,12 @@ fi NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/wireplumber/wireplumber.url b/source/l/wireplumber/wireplumber.url index 69f04fa02..c6ae9aa21 100644 --- a/source/l/wireplumber/wireplumber.url +++ b/source/l/wireplumber/wireplumber.url @@ -1 +1,2 @@ https://gitlab.freedesktop.org/pipewire/wireplumber +https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.5.6/wireplumber-0.5.6.tar.gz diff --git a/source/l/xapian-core/xapian-core.SlackBuild b/source/l/xapian-core/xapian-core.SlackBuild index c3bc72fea..95b8df13b 100755 --- a/source/l/xapian-core/xapian-core.SlackBuild +++ b/source/l/xapian-core/xapian-core.SlackBuild @@ -33,8 +33,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$MARCH ;; @@ -49,18 +48,12 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" |