Tkimg 2.1.0 (#24635)

* tkimg: update to 2.1.0

* tkimg: remove unneeded patch

The build proceeds without this patch.

---------

Co-authored-by: Oscar Fuentes <ofv@wanadoo.es>
This commit is contained in:
oscarfv 2025-06-24 19:27:56 +02:00 committed by GitHub
parent 93822364eb
commit 70d1cec7ee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 345 deletions

View File

@ -1,300 +0,0 @@
diff -Naur Img-1.4.9-orig/bmp/configure Img-1.4.9/bmp/configure
--- Img-1.4.9-orig/bmp/configure 2019-02-02 13:20:50.000000000 +0300
+++ Img-1.4.9/bmp/configure 2019-06-11 08:03:18.081466900 +0300
@@ -2237,7 +2237,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/configure Img-1.4.9/configure
--- Img-1.4.9-orig/configure 2019-02-02 13:24:35.000000000 +0300
+++ Img-1.4.9/configure 2019-06-11 08:03:11.623055500 +0300
@@ -2216,7 +2216,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/dted/configure Img-1.4.9/dted/configure
--- Img-1.4.9-orig/dted/configure 2019-02-02 13:21:01.000000000 +0300
+++ Img-1.4.9/dted/configure 2019-06-11 08:05:50.289827400 +0300
@@ -2237,7 +2237,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/flir/configure Img-1.4.9/flir/configure
--- Img-1.4.9-orig/flir/configure 2019-02-02 13:21:13.000000000 +0300
+++ Img-1.4.9/flir/configure 2019-06-11 08:07:19.709184400 +0300
@@ -2237,7 +2237,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/gif/configure Img-1.4.9/gif/configure
--- Img-1.4.9-orig/gif/configure 2019-02-02 13:21:24.000000000 +0300
+++ Img-1.4.9/gif/configure 2019-06-11 08:06:25.327488900 +0300
@@ -2237,7 +2237,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/ico/configure Img-1.4.9/ico/configure
--- Img-1.4.9-orig/ico/configure 2019-02-02 13:21:36.000000000 +0300
+++ Img-1.4.9/ico/configure 2019-06-11 08:06:49.944332100 +0300
@@ -2237,7 +2237,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/jpeg/configure Img-1.4.9/jpeg/configure
--- Img-1.4.9-orig/jpeg/configure 2019-02-02 13:21:46.000000000 +0300
+++ Img-1.4.9/jpeg/configure 2019-06-11 08:07:47.134032600 +0300
@@ -2249,7 +2249,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/libjpeg/configure Img-1.4.9/libjpeg/configure
--- Img-1.4.9-orig/libjpeg/configure 2016-04-01 01:16:05.000000000 +0300
+++ Img-1.4.9/libjpeg/configure 2019-06-11 08:08:15.604082600 +0300
@@ -1353,7 +1353,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/libpng/configure Img-1.4.9/libpng/configure
--- Img-1.4.9-orig/libpng/configure 2018-09-16 21:19:36.000000000 +0300
+++ Img-1.4.9/libpng/configure 2019-06-11 08:08:39.347324300 +0300
@@ -1354,7 +1354,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/libtiff/configure Img-1.4.9/libtiff/configure
--- Img-1.4.9-orig/libtiff/configure 2015-07-07 00:08:15.000000000 +0300
+++ Img-1.4.9/libtiff/configure 2019-06-11 08:09:04.962569300 +0300
@@ -1353,7 +1353,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/pcx/configure Img-1.4.9/pcx/configure
--- Img-1.4.9-orig/pcx/configure 2019-02-02 13:21:57.000000000 +0300
+++ Img-1.4.9/pcx/configure 2019-06-11 08:09:23.386201600 +0300
@@ -2237,7 +2237,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/pixmap/configure Img-1.4.9/pixmap/configure
--- Img-1.4.9-orig/pixmap/configure 2019-02-02 13:22:08.000000000 +0300
+++ Img-1.4.9/pixmap/configure 2019-06-11 08:09:49.266647100 +0300
@@ -2240,7 +2240,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/png/configure Img-1.4.9/png/configure
--- Img-1.4.9-orig/png/configure 2019-02-02 13:22:21.000000000 +0300
+++ Img-1.4.9/png/configure 2019-06-11 08:10:16.426294800 +0300
@@ -2261,7 +2261,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/ppm/configure Img-1.4.9/ppm/configure
--- Img-1.4.9-orig/ppm/configure 2019-02-02 13:22:31.000000000 +0300
+++ Img-1.4.9/ppm/configure 2019-06-11 08:10:37.735932200 +0300
@@ -2237,7 +2237,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/ps/configure Img-1.4.9/ps/configure
--- Img-1.4.9-orig/ps/configure 2019-02-02 13:22:42.000000000 +0300
+++ Img-1.4.9/ps/configure 2019-06-11 08:11:55.892069500 +0300
@@ -2237,7 +2237,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/raw/configure Img-1.4.9/raw/configure
--- Img-1.4.9-orig/raw/configure 2019-02-02 13:22:52.000000000 +0300
+++ Img-1.4.9/raw/configure 2019-06-11 08:12:14.861702800 +0300
@@ -2237,7 +2237,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/sgi/configure Img-1.4.9/sgi/configure
--- Img-1.4.9-orig/sgi/configure 2019-02-02 13:23:02.000000000 +0300
+++ Img-1.4.9/sgi/configure 2019-06-11 08:12:34.876538000 +0300
@@ -2237,7 +2237,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/sun/configure Img-1.4.9/sun/configure
--- Img-1.4.9-orig/sun/configure 2019-02-02 13:23:12.000000000 +0300
+++ Img-1.4.9/sun/configure 2019-06-11 08:13:14.656607800 +0300
@@ -2237,7 +2237,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/tclconfig/tcl.m4 Img-1.4.9/tclconfig/tcl.m4
--- Img-1.4.9-orig/tclconfig/tcl.m4 2016-03-30 23:13:40.000000000 +0300
+++ Img-1.4.9/tclconfig/tcl.m4 2019-06-11 08:14:00.988689200 +0300
@@ -2884,7 +2884,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo)
EXEEXT=".exe"
TEA_PLATFORM="windows"
diff -Naur Img-1.4.9-orig/tga/configure Img-1.4.9/tga/configure
--- Img-1.4.9-orig/tga/configure 2019-02-02 13:23:22.000000000 +0300
+++ Img-1.4.9/tga/configure 2019-06-11 08:14:29.942340100 +0300
@@ -2237,7 +2237,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/tiff/configure Img-1.4.9/tiff/configure
--- Img-1.4.9-orig/tiff/configure 2019-02-02 13:23:32.000000000 +0300
+++ Img-1.4.9/tiff/configure 2019-06-11 08:14:52.749580100 +0300
@@ -2273,7 +2273,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/window/configure Img-1.4.9/window/configure
--- Img-1.4.9-orig/window/configure 2019-02-02 13:23:42.000000000 +0300
+++ Img-1.4.9/window/configure 2019-06-11 08:15:19.690827500 +0300
@@ -2240,7 +2240,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/xbm/configure Img-1.4.9/xbm/configure
--- Img-1.4.9-orig/xbm/configure 2019-02-02 13:23:53.000000000 +0300
+++ Img-1.4.9/xbm/configure 2019-06-11 08:15:39.970863100 +0300
@@ -2237,7 +2237,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/xpm/configure Img-1.4.9/xpm/configure
--- Img-1.4.9-orig/xpm/configure 2019-02-02 13:24:04.000000000 +0300
+++ Img-1.4.9/xpm/configure 2019-06-11 08:16:00.859299800 +0300
@@ -2237,7 +2237,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff -Naur Img-1.4.9-orig/zlib/configure Img-1.4.9/zlib/configure
--- Img-1.4.9-orig/zlib/configure 2017-01-16 18:00:56.000000000 +0300
+++ Img-1.4.9/zlib/configure 2019-06-11 08:16:19.516932500 +0300
@@ -1353,7 +1353,7 @@
fi
case "`uname -s`" in
- *win32*|*WIN32*|*MINGW32_*|*MINGW64_*|*MSYS_*)
+ *win32*|*WIN32*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5

View File

@ -1,33 +0,0 @@
Index: base/tkimg.h
===================================================================
--- a/base/tkimg.h (revision 957)
+++ b/base/tkimg.h (working copy)
@@ -24,7 +24,7 @@
# define tkimg_vsnprintf vsnprintf
#endif /* _MSC_VER_ */
-#if defined(__MINGW32__)
+#if defined(__MINGW32__) && !defined(__aarch64__) && !defined(_UCRT)
# define SETJMP(jbuf) __builtin_setjmp(jbuf)
# define LONGJMP(jbuf, code) __builtin_longjmp(jbuf, code)
#else
Index: compat/libtiff/libtiff/tif_ojpeg.c
===================================================================
--- a/compat/libtiff/libtiff/tif_ojpeg.c (revision 957)
+++ b/compat/libtiff/libtiff/tif_ojpeg.c (working copy)
@@ -152,8 +152,13 @@
*/
/* define LIBJPEG_ENCAP_EXTERNAL */
-#define SETJMP(jbuf) setjmp(jbuf)
-#define LONGJMP(jbuf, code) longjmp(jbuf, code)
+#if defined(__MINGW32__) && !defined(__aarch64__) && !defined(_UCRT)
+# define SETJMP(jbuf) __builtin_setjmp(jbuf)
+# define LONGJMP(jbuf, code) __builtin_longjmp(jbuf, code)
+#else
+# define SETJMP(jbuf) setjmp(jbuf)
+# define LONGJMP(jbuf, code) longjmp(jbuf, code)
+#endif
#define JMP_BUF jmp_buf
#define OJPEG_BUFFER 2048
/* define EGYPTIANWALK */

View File

@ -4,8 +4,8 @@
_pkgname=tkimg
pkgbase=mingw-w64-${_pkgname}
pkgname=${MINGW_PACKAGE_PREFIX}-$_pkgname
pkgver=2.0.1
pkgrel=2
pkgver=2.1.0
pkgrel=1
pkgdesc="Adds support to Tk for many other Image formats: BMP, XBM, XPM, GIF, PNG, JPEG, TIFF and postscript (mingw-64)"
url="https://tkimg.sourceforge.io/"
arch=('any')
@ -23,13 +23,9 @@ makedepends=(
"${MINGW_PACKAGE_PREFIX}-autotools"
"${MINGW_PACKAGE_PREFIX}-cc")
source=("https://downloads.sourceforge.net/project/tkimg/tkimg/${pkgver:0:3}/tkimg%20${pkgver}/Img-${pkgver}.tar.gz"
002-dtplite_tcl.patch
003-msys_mingw-no-need-cygpath.patch
005-setjmp.patch)
sha256sums=('e69d31b3f439a19071e3508a798b9d5dc70b9416e00926cdac12c1c2d50fce83'
'eb39aa5f628852b8030041c082e1ede89e2516930125572e5b1f8bc1bcbe8fca'
'68e8b83214ec9523f2be0d144efd3364e4588e769626538d499543504835083f'
'512c68d7264617421bae02822265fa1959ab3b9caf364dd5ec6929bff0100831')
002-dtplite_tcl.patch)
sha256sums=('98286b5f4ae57e1c73705ac5a08ede54444b610329241ecc13e99d60ce5c7095'
'eb39aa5f628852b8030041c082e1ede89e2516930125572e5b1f8bc1bcbe8fca')
apply_patch_with_msg() {
for _patch in "$@"
@ -43,9 +39,7 @@ prepare() {
cd "${srcdir}/Img-${pkgver}"
apply_patch_with_msg \
002-dtplite_tcl.patch \
003-msys_mingw-no-need-cygpath.patch \
005-setjmp.patch
002-dtplite_tcl.patch
autoreconf -fiv
}