diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/kde/kde/build/kwin | 2 | ||||
-rw-r--r-- | source/kde/kde/patch/kwin.patch | 1 | ||||
-rw-r--r-- | source/kde/kde/patch/kwin/e6b20c47ea2d3dfc38632958e0be295a0d376e1f.patch | 27 | ||||
-rw-r--r-- | source/l/SDL2/SDL2.url | 2 | ||||
-rw-r--r-- | source/l/netpbm/netpbm-ppmfadeusage.patch | 88 |
5 files changed, 71 insertions, 49 deletions
diff --git a/source/kde/kde/build/kwin b/source/kde/kde/build/kwin index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kwin +++ b/source/kde/kde/build/kwin @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/patch/kwin.patch b/source/kde/kde/patch/kwin.patch new file mode 100644 index 000000000..9ecc2e620 --- /dev/null +++ b/source/kde/kde/patch/kwin.patch @@ -0,0 +1 @@ +cat $CWD/patch/kwin/e6b20c47ea2d3dfc38632958e0be295a0d376e1f.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/kwin/e6b20c47ea2d3dfc38632958e0be295a0d376e1f.patch b/source/kde/kde/patch/kwin/e6b20c47ea2d3dfc38632958e0be295a0d376e1f.patch new file mode 100644 index 000000000..91f42a6d5 --- /dev/null +++ b/source/kde/kde/patch/kwin/e6b20c47ea2d3dfc38632958e0be295a0d376e1f.patch @@ -0,0 +1,27 @@ +From e6b20c47ea2d3dfc38632958e0be295a0d376e1f Mon Sep 17 00:00:00 2001 +From: Aki Sakurai <kde@aki.tw> +Date: Thu, 28 Sep 2023 23:50:32 +0800 +Subject: [PATCH] fix segfault in EglGbmBackend::textureForOutput + +(cherry picked from commit 0f1da589ebc90d7436d4f6e8a418be76c10258c6) +--- + src/backends/drm/drm_egl_backend.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/backends/drm/drm_egl_backend.cpp b/src/backends/drm/drm_egl_backend.cpp +index 3b22ef21db2..d6adbe83f04 100644 +--- a/src/backends/drm/drm_egl_backend.cpp ++++ b/src/backends/drm/drm_egl_backend.cpp +@@ -214,6 +214,9 @@ OutputLayer *EglGbmBackend::primaryLayer(Output *output) + std::shared_ptr<GLTexture> EglGbmBackend::textureForOutput(Output *output) const + { + const auto drmOutput = static_cast<DrmAbstractOutput *>(output); ++ if (const auto virtualLayer = dynamic_cast<VirtualEglGbmLayer *>(drmOutput->primaryLayer())) { ++ return virtualLayer->texture(); ++ } + return static_cast<EglGbmLayer *>(drmOutput->primaryLayer())->texture(); + } + +-- +GitLab + diff --git a/source/l/SDL2/SDL2.url b/source/l/SDL2/SDL2.url index a39302cd1..8bbf1eb41 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.28.3/SDL2-2.28.3.tar.gz +https://github.com/libsdl-org/SDL/releases/download/release-2.28.4/SDL2-2.28.4.tar.gz diff --git a/source/l/netpbm/netpbm-ppmfadeusage.patch b/source/l/netpbm/netpbm-ppmfadeusage.patch index d48f5f546..9c1f31b22 100644 --- a/source/l/netpbm/netpbm-ppmfadeusage.patch +++ b/source/l/netpbm/netpbm-ppmfadeusage.patch @@ -1,57 +1,51 @@ -diff -urNp old/editor/ppmfade new/editor/ppmfade ---- old/editor/ppmfade 2017-11-01 11:47:49.869611402 +0100 -+++ new/editor/ppmfade 2017-11-01 11:53:25.524973342 +0100 -@@ -84,7 +84,7 @@ for ($n = 0; $n < @ARGV; $n++) { - if (-e $first_file) { - } else { - print "I can't find first file '$first_file'\n"; -- exit 20; +--- ./editor/ppmfade.orig 2023-10-02 13:25:51.308938861 -0500 ++++ ./editor/ppmfade 2023-10-02 13:28:24.940930364 -0500 +@@ -109,13 +109,13 @@ + print STDERR ("There are no non-option arguments possible. " . + "You specified '$arg'\n"); + } +- exit 100; + exit 1; } - } elsif ($ARGV[$n] eq "-l") { - $n++; -@@ -92,7 +92,7 @@ for ($n = 0; $n < @ARGV; $n++) { - if (-e $last_file) { + } + + if (!defined($firstFileNm) && !defined($lastFileNm)) { + print STDERR ("You must specify -f or -l (or both)\n"); +- exit 90; ++ exit 1; + } + + if (!defined($mode)) { +@@ -142,7 +142,7 @@ } else { - print "I can't find last file '$last_file'\n"; -- exit 20; + print STDERR + ("Unrecognized results from pnmfile on $firstFileNm.\n"); +- exit(50); + exit 1; } - } elsif ($ARGV[$n] eq "-base") { - $n++; -@@ -113,9 +113,12 @@ for ($n = 0; $n < @ARGV; $n++) { - $mode = $BLOCK; - } elsif ("$ARGV[$n]" eq "-mix") { - $mode = $MIX; -+ } elsif ($ARGV[$n] eq "-help" || $ARGV[$n] eq "--help" || $ARGV[$n] eq "-h") { -+ print "ppmfade: Use 'man ppmfade' for help.\n"; -+ exit 1; } else { - print "Unknown argument: $ARGV[$n]\n"; -- exit 100; -+ exit 1; - } - } - # -@@ -134,18 +137,18 @@ if ($first_file ne "undefined") { - $width = $1; $height = $2; - } else { - print("Unrecognized results from pnmfile on $first_file.\n"); -- exit(50); -+ exit 1; - } - } elsif ($last_file ne "undefined") { - if ((`pnmfile $last_file` =~ m{\b(\d+)\sby\s(\d+)} )) { - $width = $1; $height = $2; - } else { - print("Unrecognized results from pnmfile on $first_file.\n"); -- exit(50); -+ exit 1; + # $lastFileNm is defined +@@ -151,7 +151,7 @@ + } else { + print STDERR + ("Unrecognized results from pnmfile on $firstFileNm.\n"); +- exit(50); ++ exit 1; + } } - } else { - print("ppmfade: You must specify -f or -l (or both)\n"); -- exit(90); + return $width, $height; +@@ -436,12 +436,12 @@ + + if (defined($firstFileNm) && !-e($firstFileNm)) { + print STDERR ("First file '$firstFileNm' does not exist\n"); +- exit 20; ++ exit 1; + } + + if (defined($lastFileNm) && !-e($lastFileNm)) { + print STDERR ("Last file '$lastFileNm' does not exist\n"); +- exit 20; + exit 1; } - print("Frames are " . $width . "W x " . $height . "H\n"); + my ($width, $height) = imageDimensions($firstFileNm, $lastFileNm); |