diff options
Diffstat (limited to 'source')
-rwxr-xr-x | source/a/aaa_libraries/aaa_libraries.SlackBuild | 2 | ||||
-rw-r--r-- | source/a/mkinitrd/0007-kmod30.patch | 14 | ||||
-rwxr-xr-x | source/a/mkinitrd/mkinitrd.SlackBuild | 7 | ||||
-rw-r--r-- | source/kde/kde/build/plasma-framework | 2 | ||||
-rw-r--r-- | source/kde/kde/patch/plasma-framework.patch | 1 | ||||
-rw-r--r-- | source/kde/kde/patch/plasma-framework/dff1b034c1162062aa2292099d3d01fc53dafdf6.patch | 42 | ||||
-rwxr-xr-x | source/l/SDL2_image/SDL2_image.SlackBuild | 4 | ||||
-rwxr-xr-x | source/l/SDL2_mixer/SDL2_mixer.SlackBuild | 5 | ||||
-rwxr-xr-x | source/n/openssl/openssl.SlackBuild | 3 |
9 files changed, 28 insertions, 52 deletions
diff --git a/source/a/aaa_libraries/aaa_libraries.SlackBuild b/source/a/aaa_libraries/aaa_libraries.SlackBuild index ff27cd322..fdaeb8429 100755 --- a/source/a/aaa_libraries/aaa_libraries.SlackBuild +++ b/source/a/aaa_libraries/aaa_libraries.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=aaa_libraries VERSION=${VERSION:-15.1} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/mkinitrd/0007-kmod30.patch b/source/a/mkinitrd/0007-kmod30.patch new file mode 100644 index 000000000..484f8c91e --- /dev/null +++ b/source/a/mkinitrd/0007-kmod30.patch @@ -0,0 +1,14 @@ +--- ./mkinitrd.orig 2022-07-09 12:56:10.493030210 -0500 ++++ ./mkinitrd 2022-07-09 12:57:38.848032187 -0500 +@@ -702,9 +702,9 @@ + cp -a /sbin/$i $SOURCE_TREE/sbin ; + done + +-# Make sure modules.builtin and modules.order are there (for kmod): ++# Make sure modules.builtin, modules.builtin.modinfo, and modules.order are there (for kmod): + for kver in $(echo ${KERNEL_VERSION} | tr ':' '\n') ; do +- cp /lib/modules/$kver/modules.{builtin,order} \ ++ cp /lib/modules/$kver/modules.{builtin,builtin.modinfo,order} \ + $SOURCE_TREE/lib/modules/$kver + done + diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild index 456e4481a..d23adbc95 100755 --- a/source/a/mkinitrd/mkinitrd.SlackBuild +++ b/source/a/mkinitrd/mkinitrd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2021 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mkinitrd VERSION=${VERSION:-1.4.11} BB=1.32.1 -BUILD=${BUILD:-29} +BUILD=${BUILD:-30} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -132,6 +132,9 @@ rm -f $PKG/sbin/mkinitrd.orig # Use -R if we detect the root partition is a partition of a RAID device: ( cd $PKG/usr/share/mkinitrd ; zcat $CWD/0004-check-if-BASEDEV-is-a-partition-of-a-RAID-volume.patch.gz | patch -p1 --verbose || exit 1) || exit 1 rm -f $PKG/usr/share/mkinitrd/mkinitrd_command_generator.sh.orig +# Fix for kmod-30: +( cd $PKG/sbin ; zcat $CWD/0007-kmod30.patch.gz | patch -p1 --verbose || exit 1) || exit 1 +rm -f $PKG/sbin/mkinitrd.orig mkdir -p $PKG/usr/man/man{5,8} cat $CWD/mkinitrd.conf.5 | gzip -9c > $PKG/usr/man/man5/mkinitrd.conf.5.gz diff --git a/source/kde/kde/build/plasma-framework b/source/kde/kde/build/plasma-framework index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/plasma-framework +++ b/source/kde/kde/build/plasma-framework @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/patch/plasma-framework.patch b/source/kde/kde/patch/plasma-framework.patch deleted file mode 100644 index 23919a6e5..000000000 --- a/source/kde/kde/patch/plasma-framework.patch +++ /dev/null @@ -1 +0,0 @@ -cat $CWD/patch/plasma-framework/dff1b034c1162062aa2292099d3d01fc53dafdf6.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/plasma-framework/dff1b034c1162062aa2292099d3d01fc53dafdf6.patch b/source/kde/kde/patch/plasma-framework/dff1b034c1162062aa2292099d3d01fc53dafdf6.patch deleted file mode 100644 index 300612763..000000000 --- a/source/kde/kde/patch/plasma-framework/dff1b034c1162062aa2292099d3d01fc53dafdf6.patch +++ /dev/null @@ -1,42 +0,0 @@ -From dff1b034c1162062aa2292099d3d01fc53dafdf6 Mon Sep 17 00:00:00 2001 -From: Ahmad Samir <a.samirh78@gmail.com> -Date: Tue, 14 Jun 2022 14:05:32 +0200 -Subject: [PATCH] Revert "Use QT_FEATURE_foo to detect opengl* support, and - TARGET for glesv2" - -This reverts commit 31884dc195c815054bfa6b15a90753d2d0ae1ea9. ---- - CMakeLists.txt | 3 ++- - src/declarativeimports/core/CMakeLists.txt | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6698a2091..63229cdfb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -118,7 +118,8 @@ set_package_properties(EGL PROPERTIES - TYPE OPTIONAL - ) - --if(OpenGL_GLX_FOUND AND X11_FOUND AND QT_FEATURE_opengl) -+get_target_property(QtGui_Enabled_Features Qt${QT_MAJOR_VERSION}::Gui QT_ENABLED_PUBLIC_FEATURES) -+if(OpenGL_GLX_FOUND AND X11_FOUND AND (QtGui_Enabled_Features MATCHES "opengl")) - add_feature_info(GLX OpenGL_GLX_FOUND "OpenGL GLX libraries.") - set(HAVE_GLX 1) - else() -diff --git a/src/declarativeimports/core/CMakeLists.txt b/src/declarativeimports/core/CMakeLists.txt -index d08b4c619..2136bb985 100644 ---- a/src/declarativeimports/core/CMakeLists.txt -+++ b/src/declarativeimports/core/CMakeLists.txt -@@ -70,7 +70,7 @@ else() - - endif() - --if(TARGET Qt${QT_MAJOR_VERSION}::Gui_GLESv2) -+if(QtGui_Enabled_Features MATCHES "opengles2") - target_link_libraries(corebindingsplugin Qt${QT_MAJOR_VERSION}::Gui_GLESv2) - endif() - --- -GitLab - diff --git a/source/l/SDL2_image/SDL2_image.SlackBuild b/source/l/SDL2_image/SDL2_image.SlackBuild index 9e605ae46..1f856b893 100755 --- a/source/l/SDL2_image/SDL2_image.SlackBuild +++ b/source/l/SDL2_image/SDL2_image.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=SDL2_image 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 @@ -131,7 +131,7 @@ fi # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - AUTHORS* BUGS* COPYING* CHANGES* CREDITS* NEWS* README* TODO* WhatsNew* \ + AUTHORS* BUGS* COPYING* CHANGES* CREDITS* LICENSE* NEWS* README* TODO* WhatsNew* \ $PKG/usr/doc/${PKGNAM}-$VERSION # If there's a ChangeLog, installing at least part of the recent history diff --git a/source/l/SDL2_mixer/SDL2_mixer.SlackBuild b/source/l/SDL2_mixer/SDL2_mixer.SlackBuild index e3860ba56..f7e461678 100755 --- a/source/l/SDL2_mixer/SDL2_mixer.SlackBuild +++ b/source/l/SDL2_mixer/SDL2_mixer.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=SDL2_mixer 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 @@ -128,7 +128,7 @@ fi # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - AUTHORS* BUGS* COPYING* CHANGES* CREDITS* NEWS* README* TODO* WhatsNew* \ + AUTHORS* BUGS* COPYING* CHANGES* CREDITS* LICENSE* NEWS* README* TODO* WhatsNew* \ $PKG/usr/doc/${PKGNAM}-$VERSION # If there's a ChangeLog, installing at least part of the recent history @@ -144,4 +144,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/n/openssl/openssl.SlackBuild b/source/n/openssl/openssl.SlackBuild index 523f91f74..e497f250a 100755 --- a/source/n/openssl/openssl.SlackBuild +++ b/source/n/openssl/openssl.SlackBuild @@ -150,6 +150,9 @@ rm -f $PKG1/usr/lib${LIBDIRSUFFIX}/*.a # No thanks on manpages duplicated as html: rm -rf $PKG1/usr/share/doc +# Also no thanks on .pod versions of the already shipped manpages: +rm -rf $PKG1/usr/doc/openssl-*/doc/man* + # Make the .so.? library symlinks: ( cd $PKG1/usr/lib${LIBDIRSUFFIX} ; ldconfig -l lib*.so.* ) |