15 files changed, 22 insertions, 34 deletions
diff --git a/source/l/SDL2/SDL2.SlackBuild b/source/l/SDL2/SDL2.SlackBuild
index 17883399..71524d24 100755
--- a/source/l/SDL2/SDL2.SlackBuild
+++ b/source/l/SDL2/SDL2.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=SDL2
 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
@@ -85,8 +85,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-zcat $CWD/SDL2.no-werror-declaration-after-statement.diff.gz | patch -p1 --backup --suffix=.orig || exit 1
-
 # Configure, build, and install:
 mkdir cmake-build
 cd cmake-build
@@ -127,9 +125,12 @@ 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
 
+# Drop this duplicate that's also in a directory we don't use:
+rm -r $PKG/usr/share/licenses
+
 # If there's a ChangeLog, installing at least part of the recent history
 # is useful, but don't let it get totally out of control:
 if [ -r ChangeLog ]; then
diff --git a/source/l/SDL2/SDL2.no-werror-declaration-after-statement.diff b/source/l/SDL2/SDL2.no-werror-declaration-after-statement.diff
deleted file mode 100644
index 52e61288..00000000
--- a/source/l/SDL2/SDL2.no-werror-declaration-after-statement.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./CMakeLists.txt.orig	2022-04-21 12:37:37.000000000 -0500
-+++ ./CMakeLists.txt	2022-04-26 13:11:44.293866236 -0500
-@@ -532,15 +532,6 @@
-     list(APPEND EXTRA_CFLAGS "-fno-strict-aliasing")
-   endif()
- 
--  check_c_compiler_flag(-Wdeclaration-after-statement HAVE_GCC_WDECLARATION_AFTER_STATEMENT)
--  if(HAVE_GCC_WDECLARATION_AFTER_STATEMENT)
--    check_c_compiler_flag(-Werror=declaration-after-statement HAVE_GCC_WERROR_DECLARATION_AFTER_STATEMENT)
--    if(HAVE_GCC_WERROR_DECLARATION_AFTER_STATEMENT)
--      list(APPEND EXTRA_CFLAGS "-Werror=declaration-after-statement")
--    endif()
--    list(APPEND EXTRA_CFLAGS "-Wdeclaration-after-statement")
--  endif()
--
-   if(DEPENDENCY_TRACKING)
-     check_c_source_compiles("
-         #if !defined(__GNUC__) || __GNUC__ < 3
diff --git a/source/l/SDL2/SDL2.url b/source/l/SDL2/SDL2.url
new file mode 100644
index 00000000..c9d562ac
--- /dev/null
+++ b/source/l/SDL2/SDL2.url
@@ -0,0 +1 @@
+https://github.com/libsdl-org/SDL
diff --git a/source/l/SDL2_image/SDL2_image.url b/source/l/SDL2_image/SDL2_image.url
new file mode 100644
index 00000000..6632040c
--- /dev/null
+++ b/source/l/SDL2_image/SDL2_image.url
@@ -0,0 +1 @@
+https://github.com/libsdl-org/SDL_image
diff --git a/source/l/SDL2_image/slack-desc b/source/l/SDL2_image/slack-desc
index 19116262..732a8efc 100644
--- a/source/l/SDL2_image/slack-desc
+++ b/source/l/SDL2_image/slack-desc
@@ -12,7 +12,7 @@ SDL2_image: This is a simple library to load images of various formats as SDL
 SDL2_image: surfaces. This library supports BMP, PNM (PPM/PGM/PBM), XPM, LBM,
 SDL2_image: PCX, GIF, JPEG, PNG, TGA, and TIFF formats.
 SDL2_image:
-SDL2_image: Homepage: http://www.libsdl.org/projects/SDL_image/
+SDL2_image: Homepage: https://github.com/libsdl-org/SDL_image
 SDL2_image:
 SDL2_image:
 SDL2_image:
diff --git a/source/l/SDL2_mixer/SDL2_mixer.url b/source/l/SDL2_mixer/SDL2_mixer.url
new file mode 100644
index 00000000..d7cb71f2
--- /dev/null
+++ b/source/l/SDL2_mixer/SDL2_mixer.url
@@ -0,0 +1 @@
+https://github.com/libsdl-org/SDL_mixer
diff --git a/source/l/SDL2_mixer/slack-desc b/source/l/SDL2_mixer/slack-desc
index 267f6fe7..1e16f616 100644
--- a/source/l/SDL2_mixer/slack-desc
+++ b/source/l/SDL2_mixer/slack-desc
@@ -12,7 +12,7 @@ SDL2_mixer: SDL_mixer is a simple multi-channel audio mixer library. It supports
 SDL2_mixer: any number of simultaneously playing channels of 16 bit stereo audio,
 SDL2_mixer: plus a single channel of music.
 SDL2_mixer:
-SDL2_mixer: Homepage: http://www.libsdl.org/projects/SDL_mixer/
+SDL2_mixer: Homepage: https://github.com/libsdl-org/SDL_mixer
 SDL2_mixer:
 SDL2_mixer:
 SDL2_mixer:
diff --git a/source/l/SDL2_net/SDL2_net.SlackBuild b/source/l/SDL2_net/SDL2_net.SlackBuild
index 96a6236b..84ed36e7 100755
--- a/source/l/SDL2_net/SDL2_net.SlackBuild
+++ b/source/l/SDL2_net/SDL2_net.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2017, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2017, 2018, 2022  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=SDL2_net
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+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
@@ -75,7 +75,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
 chown -R root:root .
@@ -143,4 +143,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/SDL2_net/SDL2_net.url b/source/l/SDL2_net/SDL2_net.url
new file mode 100644
index 00000000..85f56f30
--- /dev/null
+++ b/source/l/SDL2_net/SDL2_net.url
@@ -0,0 +1 @@
+https://github.com/libsdl-org/SDL_net
diff --git a/source/l/SDL2_net/slack-desc b/source/l/SDL2_net/slack-desc
index 5a31ec31..0541f5c9 100644
--- a/source/l/SDL2_net/slack-desc
+++ b/source/l/SDL2_net/slack-desc
@@ -10,7 +10,7 @@ SDL2_net: SDL2_net (SDL2 network library)
 SDL2_net:
 SDL2_net: This is an example portable network library for use with SDL.
 SDL2_net:
-SDL2_net: Homepage: http://www.libsdl.org/projects/SDL_net/
+SDL2_net: Homepage: https://github.com/libsdl-org/SDL_net
 SDL2_net:
 SDL2_net:
 SDL2_net:
diff --git a/source/l/SDL2_ttf/SDL2_ttf.url b/source/l/SDL2_ttf/SDL2_ttf.url
new file mode 100644
index 00000000..7d690504
--- /dev/null
+++ b/source/l/SDL2_ttf/SDL2_ttf.url
@@ -0,0 +1 @@
+https://github.com/libsdl-org/SDL_ttf
diff --git a/source/l/SDL2_ttf/slack-desc b/source/l/SDL2_ttf/slack-desc
index 6231947e..330384c9 100644
--- a/source/l/SDL2_ttf/slack-desc
+++ b/source/l/SDL2_ttf/slack-desc
@@ -11,7 +11,7 @@ SDL2_ttf:
 SDL2_ttf: This library allows you to use TrueType fonts to render text in SDL2
 SDL2_ttf: applications.
 SDL2_ttf:
-SDL2_ttf: Homepage: http://www.libsdl.org/projects/SDL_ttf/
+SDL2_ttf: Homepage: https://github.com/libsdl-org/SDL_ttf
 SDL2_ttf:
 SDL2_ttf:
 SDL2_ttf:
diff --git a/source/l/gtk4/gtk4.SlackBuild b/source/l/gtk4/gtk4.SlackBuild
index 7e065ab6..dd3b8e74 100755
--- a/source/l/gtk4/gtk4.SlackBuild
+++ b/source/l/gtk4/gtk4.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gtk4
 VERSION=${VERSION:-$(echo gtk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/l/libxslt/libxslt.SlackBuild b/source/l/libxslt/libxslt.SlackBuild
index 5bff2362..0216ab70 100755
--- a/source/l/libxslt/libxslt.SlackBuild
+++ b/source/l/libxslt/libxslt.SlackBuild
@@ -89,6 +89,7 @@ if [ ! -r configure ]; then
     autoreconf -vif
   fi
 fi
+PYTHON=/usr/bin/python3 \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -104,7 +105,7 @@ make install DESTDIR=$PKG || exit 1
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 mv $PKG/usr/share/doc $PKG/usr
-mv $PKG/usr/doc/libxslt-python-$VERSION $PKG/usr/doc/libxslt-$VERSION
+mv $PKG/usr/doc/libxslt $PKG/usr/doc/libxslt-$VERSION
 cp -a \
   AUTHORS* COPYING* ChangeLog Copyright* FEATURES* HACKING* INSTALL* NEWS* README* TODO* libxslt.spec \
   $PKG/usr/doc/libxslt-$VERSION
diff --git a/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild b/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild
index 7c5c59b6..2e9446ba 100755
--- a/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild
+++ b/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus-libpinyin
 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) "}