summaryrefslogtreecommitdiffstats
path: root/source/l/SDL2
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-08-20 20:04:15 +0000
committer Eric Hameleers <alien@slackware.com>2022-08-21 07:00:13 +0200
commit2dbea3b2b0e597fa1e3fa37fbb2f250168112559 (patch)
treeb7b73e1b094435f0448d5b82c6c20814189de3c6 /source/l/SDL2
parent44bead78efe4938c08af213968dfbcc8d44f1dd0 (diff)
downloadcurrent-2dbea3b2b0e597fa1e3fa37fbb2f250168112559.tar.gz
current-2dbea3b2b0e597fa1e3fa37fbb2f250168112559.tar.xz
Sat Aug 20 20:04:15 UTC 202220220820200415
ap/vim-9.0.0231-x86_64-1.txz: Upgraded. Fix use after free. Thanks to marav for the heads-up. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-2889 (* Security fix *) l/SDL2-2.24.0-x86_64-1.txz: Upgraded. l/SDL2_image-2.6.2-x86_64-1.txz: Upgraded. l/SDL2_mixer-2.6.2-x86_64-1.txz: Upgraded. l/SDL2_net-2.2.0-x86_64-1.txz: Upgraded. l/SDL2_ttf-2.20.1-x86_64-1.txz: Upgraded. l/gmime-3.2.13-x86_64-1.txz: Upgraded. l/gtk+3-3.24.34-x86_64-1.txz: Upgraded. l/gtk4-4.6.7-x86_64-1.txz: Upgraded. l/libxslt-1.1.36-x86_64-1.txz: Upgraded. x/ibus-libpinyin-1.13.0-x86_64-1.txz: Upgraded. xap/vim-gvim-9.0.0231-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/SDL2')
-rwxr-xr-xsource/l/SDL2/SDL2.SlackBuild9
-rw-r--r--source/l/SDL2/SDL2.no-werror-declaration-after-statement.diff18
-rw-r--r--source/l/SDL2/SDL2.url1
3 files changed, 6 insertions, 22 deletions
diff --git a/source/l/SDL2/SDL2.SlackBuild b/source/l/SDL2/SDL2.SlackBuild
index 17883399f..71524d244 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 52e612888..000000000
--- 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 000000000..c9d562ac6
--- /dev/null
+++ b/source/l/SDL2/SDL2.url
@@ -0,0 +1 @@
+https://github.com/libsdl-org/SDL