diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2023-10-02 19:12:58 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2023-10-02 21:29:22 +0200 |
commit | cb4e8726f423a41c65ca89c8b8346b0974417940 (patch) | |
tree | bf5c57a15560c1927198d38a4fe52dff711a6d6c /source/l/netpbm/netpbm-ppmfadeusage.patch | |
parent | 6f7f794aa19ace132257a6c542d51da357fb624f (diff) | |
download | current-cb4e8726f423a41c65ca89c8b8346b0974417940.tar.gz current-cb4e8726f423a41c65ca89c8b8346b0974417940.tar.xz |
Mon Oct 2 19:12:58 UTC 202320231002191258
kde/kwin-5.27.8-x86_64-2.txz: Rebuilt.
[PATCH] fix segfault in EglGbmBackend::textureForOutput.
Thanks to marav.
l/SDL2-2.28.4-x86_64-1.txz: Upgraded.
l/mlt-7.20.0-x86_64-1.txz: Upgraded.
l/netpbm-11.04.02-x86_64-1.txz: Upgraded.
x/xterm-385-x86_64-1.txz: Upgraded.
xfce/xfce4-pulseaudio-plugin-0.4.8-x86_64-1.txz: Upgraded.
Diffstat (limited to '')
-rw-r--r-- | source/l/netpbm/netpbm-ppmfadeusage.patch | 88 |
1 files changed, 41 insertions, 47 deletions
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); |