diff options
Diffstat (limited to 'source')
23 files changed, 110 insertions, 55 deletions
diff --git a/source/a/iniparser/iniparser.SlackBuild b/source/a/iniparser/iniparser.SlackBuild index f4861c874..9f295e869 100755 --- a/source/a/iniparser/iniparser.SlackBuild +++ b/source/a/iniparser/iniparser.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. # # Redistribution and use of this script, with or without modification, is @@ -85,15 +85,22 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# This is an easy one ;-) -make - -# Install: -mkdir -p $PKG/usr/include -cp -a src/iniparser.h src/dictionary.h $PKG/usr/include -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} -cp -a libiniparser.so.1 $PKG/usr/lib${LIBDIRSUFFIX} -ln -sf libiniparser.so.1 $PKG/usr/lib${LIBDIRSUFFIX}/libiniparser.so +# 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 \ + -DBUILD_DOCS=OFF \ + -DBUILD_STATIC_LIBS=OFF \ + .. || exit 1 + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || 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 diff --git a/source/a/ndctl/ndctl.SlackBuild b/source/a/ndctl/ndctl.SlackBuild index 8c035e31b..f691cdbd8 100755 --- a/source/a/ndctl/ndctl.SlackBuild +++ b/source/a/ndctl/ndctl.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ndctl 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/kde/kde/build/calligra b/source/kde/kde/build/calligra index e522732c7..a2720097d 100644 --- a/source/kde/kde/build/calligra +++ b/source/kde/kde/build/calligra @@ -1 +1 @@ -38 +39 diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor index 7ed6ff82d..1e8b31496 100644 --- a/source/kde/kde/build/cantor +++ b/source/kde/kde/build/cantor @@ -1 +1 @@ -5 +6 diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kfilemetadata +++ b/source/kde/kde/build/kfilemetadata @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kile b/source/kde/kde/build/kile index f5c89552b..bb95160cb 100644 --- a/source/kde/kde/build/kile +++ b/source/kde/kde/build/kile @@ -1 +1 @@ -32 +33 diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary index 00750edc0..b8626c4cf 100644 --- a/source/kde/kde/build/kitinerary +++ b/source/kde/kde/build/kitinerary @@ -1 +1 @@ -3 +4 diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index 45a4fb75d..ec635144f 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -8 +9 diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular index 00750edc0..b8626c4cf 100644 --- a/source/kde/kde/build/okular +++ b/source/kde/kde/build/okular @@ -1 +1 @@ -3 +4 diff --git a/source/kde/kde/patch/calligra/upstream_Fix-compile-with-newer-versions-of-poppler.patch b/source/kde/kde/patch/calligra/upstream_Fix-compile-with-newer-versions-of-poppler.patch index 7074bfcd1..6c8138c85 100644 --- a/source/kde/kde/patch/calligra/upstream_Fix-compile-with-newer-versions-of-poppler.patch +++ b/source/kde/kde/patch/calligra/upstream_Fix-compile-with-newer-versions-of-poppler.patch @@ -13,7 +13,7 @@ Subject: [PATCH] Fix compile with newer versions of poppler set(REQUIRED_KF5_VERSION "5.7.0") set(REQUIRED_QT_VERSION "5.3.0") -+set(CMAKE_CXX_STANDARD 17) ++set(CMAKE_CXX_STANDARD 20) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_EXTENSIONS OFF) + diff --git a/source/kde/kde/patch/kitinerary.patch b/source/kde/kde/patch/kitinerary.patch new file mode 100644 index 000000000..7183cf932 --- /dev/null +++ b/source/kde/kde/patch/kitinerary.patch @@ -0,0 +1 @@ +cat $CWD/patch/kitinerary/poppler.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/kitinerary/poppler.diff b/source/kde/kde/patch/kitinerary/poppler.diff new file mode 100644 index 000000000..b52a24553 --- /dev/null +++ b/source/kde/kde/patch/kitinerary/poppler.diff @@ -0,0 +1,16 @@ +--- ./src/lib/pdf/pdfdocument.cpp.orig 2024-02-10 05:38:52.000000000 -0600 ++++ ./src/lib/pdf/pdfdocument.cpp 2024-05-21 17:08:28.607184297 -0500 +@@ -329,13 +329,9 @@ + return {}; + } + +- if (s->hasUnicodeMarker() || s->hasUnicodeMarkerLE()) { +- return QString::fromUtf16(reinterpret_cast<const char16_t*>(s->toStr().c_str()), s->toStr().size() / 2); +- } else { + int len = 0; + std::unique_ptr<const char[]> utf16Data(pdfDocEncodingToUTF16(s->toStr(), &len)); + return QString::fromUtf16(reinterpret_cast<const char16_t*>(utf16Data.get()), len / 2); +- } + + return QString::fromUtf8(s->c_str()); + } 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/libcupsfilters/libcupsfilters.SlackBuild b/source/l/libcupsfilters/libcupsfilters.SlackBuild index f9be659c5..6947cb16a 100755 --- a/source/l/libcupsfilters/libcupsfilters.SlackBuild +++ b/source/l/libcupsfilters/libcupsfilters.SlackBuild @@ -24,7 +24,7 @@ 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:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then 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/poppler/poppler.SlackBuild b/source/l/poppler/poppler.SlackBuild index 81a5ba020..9b0d6593f 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 ) ;; @@ -50,6 +50,11 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + # Looks like this is baseline now... maybe time to bump everything to at least i686 + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -mfpmath=sse -msse -msse2" + SLKLDFLAGS="" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" LIBDIRSUFFIX="" diff --git a/source/l/python-requests/python-requests.SlackBuild b/source/l/python-requests/python-requests.SlackBuild index bd9f89ba3..cd667504c 100755 --- a/source/l/python-requests/python-requests.SlackBuild +++ b/source/l/python-requests/python-requests.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-requests VERSION=${VERSION:-$(echo requests-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} SRCNAM=requests diff --git a/source/l/qt6/fetch_sources.sh b/source/l/qt6/fetch_sources.sh index 780905738..c10d9b688 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.1" 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/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/qt6.SlackBuild b/source/l/qt6/qt6.SlackBuild index f40431fc8..60df74702 100755 --- a/source/l/qt6/qt6.SlackBuild +++ b/source/l/qt6/qt6.SlackBuild @@ -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) ;; @@ -66,6 +66,11 @@ elif [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + # Looks like this is baseline now... maybe time to bump everything to at least i686 + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -mfpmath=sse -msse -msse2 -fcf-protection=none" + SLKLDFLAGS="" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" SLKLDFLAGS="" @@ -147,14 +152,16 @@ 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 # 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 diff --git a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild index 06948306c..749114169 100755 --- a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild +++ b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild @@ -80,6 +80,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# This is needed to fix a missing define (at least on 32-bit): +cat $CWD/xwayland.CARD32.define.diff | patch -p1 --verbose || exit 1 + # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" @@ -97,7 +100,6 @@ meson setup \ --sysconfdir=/etc \ --localstatedir=/var \ --buildtype=release \ - -Dxwayland_eglstream=true \ -Ddefault_font_path="${DEF_FONTPATH}" \ -Dbuilder_string="Build ID: $PKGNAM $VERSION-$BUILD" \ -Dxkb_dir=/usr/share/X11/xkb \ diff --git a/source/x/xorg-server-xwayland/xwayland.CARD32.define.diff b/source/x/xorg-server-xwayland/xwayland.CARD32.define.diff new file mode 100644 index 000000000..10b3df156 --- /dev/null +++ b/source/x/xorg-server-xwayland/xwayland.CARD32.define.diff @@ -0,0 +1,10 @@ +--- ./os/osdep.h.orig 2024-05-15 01:21:39.000000000 -0500 ++++ ./os/osdep.h 2024-05-22 13:08:46.015040109 -0500 +@@ -52,6 +52,7 @@ + #define _OSDEP_H_ 1 + + #include <X11/Xdefs.h> ++#include <X11/Xtrans/Xtrans.h> + + #if defined(XDMCP) || defined(HASXDMAUTH) + #include <X11/Xdmcp.h> |