From f4c3241446b5eb854251d9be3ea3988d3b4ab1c5 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 18 Aug 2022 00:00:32 +0300 Subject: [PATCH] jpegoptim: bump to 1.4.7 (#7111) --- ...im-1.4.6.recipe => jpegoptim-1.4.7.recipe} | 8 +++--- .../patches/jpegoptim-1.4.6.patchset | 26 ------------------ .../patches/jpegoptim-1.4.7.patchset | 27 +++++++++++++++++++ 3 files changed, 31 insertions(+), 30 deletions(-) rename media-gfx/jpegoptim/{jpegoptim-1.4.6.recipe => jpegoptim-1.4.7.recipe} (74%) delete mode 100644 media-gfx/jpegoptim/patches/jpegoptim-1.4.6.patchset create mode 100644 media-gfx/jpegoptim/patches/jpegoptim-1.4.7.patchset diff --git a/media-gfx/jpegoptim/jpegoptim-1.4.6.recipe b/media-gfx/jpegoptim/jpegoptim-1.4.7.recipe similarity index 74% rename from media-gfx/jpegoptim/jpegoptim-1.4.6.recipe rename to media-gfx/jpegoptim/jpegoptim-1.4.7.recipe index a52679c2a..52e027ee7 100644 --- a/media-gfx/jpegoptim/jpegoptim-1.4.6.recipe +++ b/media-gfx/jpegoptim/jpegoptim-1.4.7.recipe @@ -3,11 +3,11 @@ DESCRIPTION="Jpegoptim is a utility to optimize jpeg files. Provides lossless \ optimization (based on optimizing the Huffman tables) and \"lossy\" \ optimization based on setting maximum quality factor." HOMEPAGE="https://www.kokkonen.net/tjko/projects.html" -COPYRIGHT="1996-2016 Timo Kokkonen" +COPYRIGHT="1996-2022 Timo Kokkonen" LICENSE="GNU GPL v2" -REVISION="3" -SOURCE_URI="https://www.kokkonen.net/tjko/src/jpegoptim-$portVersion.tar.gz" -CHECKSUM_SHA256="88b1eb64c2a33a2f013f068df8b0331f42c019267401ae3fa28e3277403a5ab7" +REVISION="1" +SOURCE_URI="https://github.com/tjko/jpegoptim/archive/v$portVersion/jpegoptim-$portVersion.tar.gz" +CHECKSUM_SHA256="c52616f2fb8d481315871680f9943b0f58c553d1e0c49a6bd4691a3e66d7e6de" PATCHES="jpegoptim-$portVersion.patchset" ARCHITECTURES="all" diff --git a/media-gfx/jpegoptim/patches/jpegoptim-1.4.6.patchset b/media-gfx/jpegoptim/patches/jpegoptim-1.4.6.patchset deleted file mode 100644 index 02a035bf4..000000000 --- a/media-gfx/jpegoptim/patches/jpegoptim-1.4.6.patchset +++ /dev/null @@ -1,26 +0,0 @@ -From 9d906dc85c7127b5aa6479e1579083d045fa6742 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sun, 24 Nov 2019 17:48:58 +0100 -Subject: gcc2 fix - - -diff --git a/jpegoptim.c b/jpegoptim.c -index 74017e5..9cc8c7a 100644 ---- a/jpegoptim.c -+++ b/jpegoptim.c -@@ -828,10 +828,11 @@ int main(int argc, char **argv) - outfname=newname; - } else { - #ifdef HAVE_MKSTEMPS -+ int tmpfd; - /* rely on mkstemps() to create us temporary file safely... */ - snprintf(tmpfilename,sizeof(tmpfilename), - "%sjpegoptim-%d-%d.XXXXXX.tmp", tmpdir, (int)getuid(), (int)getpid()); -- int tmpfd = mkstemps(tmpfilename,4); -+ tmpfd = mkstemps(tmpfilename,4); - if (tmpfd < 0) - fatal("%s, error creating temp file %s: mkstemps() failed",(stdin_mode?"stdin":argv[i]),tmpfilename); - if ((outfile=fdopen(tmpfd,"wb"))==NULL) --- -2.23.0 - diff --git a/media-gfx/jpegoptim/patches/jpegoptim-1.4.7.patchset b/media-gfx/jpegoptim/patches/jpegoptim-1.4.7.patchset new file mode 100644 index 000000000..261b6eb57 --- /dev/null +++ b/media-gfx/jpegoptim/patches/jpegoptim-1.4.7.patchset @@ -0,0 +1,27 @@ +From 9d906dc85c7127b5aa6479e1579083d045fa6742 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sun, 24 Nov 2019 17:48:58 +0100 +Subject: gcc2 fix + + +diff --git a/jpegoptim.c b/jpegoptim.c +index 74017e5..9cc8c7a 100644 +--- a/jpegoptim.c ++++ b/jpegoptim.c +@@ -949,12 +949,13 @@ + outfname=newname; + } else { + #ifdef HAVE_MKSTEMPS ++ int tmpfd; + /* rely on mkstemps() to create us temporary file safely... */ + int newlen = snprintf(tmpfilename,sizeof(tmpfilename), + "%sjpegoptim-%d-%d.XXXXXX.tmp", tmpdir, (int)getuid(), (int)getpid()); + if (newlen >= sizeof(tmpfilename)) + warn("temp filename too long: %s", tmpfilename); +- int tmpfd = mkstemps(tmpfilename,4); ++ tmpfd = mkstemps(tmpfilename,4); + if (tmpfd < 0) + fatal("%s, error creating temp file %s: mkstemps() failed",(stdin_mode?"stdin":argv[i]),tmpfilename); + if ((outfile = fdopen(tmpfd,"wb")) == NULL) +-- +2.23.0