Commit 38ba210c5 for imagemagick.org
commit 38ba210c5e5a660013d632a3d33c431e658befcc
Author: imagemagick[bot] <290970986+imagemagick[bot]@users.noreply.github.com>
Date: Sun Jun 21 20:10:42 2026 +0000
release
diff --git a/configure b/configure
index 6cd0ba1b7..c3a808162 100755
--- a/configure
+++ b/configure
@@ -4104,8 +4104,8 @@ ac_cxx_conftest_cxx11_main='
}
{
// Unicode literals
- auto const *utf8 = u8"UTF-8 string \u2500";
- char16_t const *utf16 = u"UTF-16 string \u2500";
+ char const *utf8 = u8"UTF-8 string \u2500";
+ char16_t const *utf16 = u"UTF-8 string \u2500";
char32_t const *utf32 = U"UTF-32 string \u2500";
}
'
@@ -5389,7 +5389,7 @@ MAGICK_PATCHLEVEL_VERSION=26
MAGICK_VERSION=7.1.2-26
-MAGICK_GIT_REVISION=6c64b5881:20260614
+MAGICK_GIT_REVISION=702175ac4:20260621
# Substitute library versioning
@@ -5413,7 +5413,7 @@ PACKAGE_BASE_VERSION=7.1.2
PACKAGE_PATCHLEVEL_VERSION=26
-if test "y" = 'y'; then
+if test "n" = 'y'; then
PACKAGE_VERSION_ADDENDUM='-26 (Beta)'
else
PACKAGE_VERSION_ADDENDUM=-26
@@ -5423,7 +5423,7 @@ PACKAGE_LIB_VERSION=0x712
PACKAGE_LIB_VERSION_NUMBER=7,1,2,26
-PACKAGE_RELEASE_DATE=2026-06-14
+PACKAGE_RELEASE_DATE=2026-06-21
# Ensure that make can run correctly
@@ -12128,18 +12128,18 @@ then :
fi
if test "$enable_largefile,$enable_year2038" != no,no
then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable large file support" >&5
-printf %s "checking for $CC option to enable large file support... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CPPFLAGS option for large files" >&5
+printf %s "checking for $CPPFLAGS option for large files... " >&6; }
if test ${ac_cv_sys_largefile_opts+y}
then :
printf %s "(cached) " >&6
else case e in #(
- e) ac_save_CC="$CC"
+ e) ac_save_CPPFLAGS=$CPPFLAGS
ac_opt_found=no
- for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1" "-n32"; do
+ for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1"; do
if test x"$ac_opt" != x"none needed"
then :
- CC="$ac_save_CC $ac_opt"
+ CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"
fi
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -12168,12 +12168,12 @@ then :
if test x"$ac_opt" = x"none needed"
then :
# GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t.
- CC="$CC -DFTYPE=ino_t"
+ CPPFLAGS="$CPPFLAGS -DFTYPE=ino_t"
if ac_fn_c_try_compile "$LINENO"
then :
else case e in #(
- e) CC="$CC -D_FILE_OFFSET_BITS=64"
+ e) CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
if ac_fn_c_try_compile "$LINENO"
then :
ac_opt='-D_FILE_OFFSET_BITS=64'
@@ -12189,7 +12189,7 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
test $ac_opt_found = no || break
done
- CC="$ac_save_CC"
+ CPPFLAGS=$ac_save_CPPFLAGS
test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" ;;
esac
@@ -12213,16 +12213,14 @@ printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h
printf "%s\n" "#define _LARGE_FILES 1" >>confdefs.h
;; #(
- "-n32") :
- CC="$CC -n32" ;; #(
*) :
as_fn_error $? "internal error: bad value for \$ac_cv_sys_largefile_opts" "$LINENO" 5 ;;
esac
if test "$enable_year2038" != no
then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option for timestamps after 2038" >&5
-printf %s "checking for $CC option for timestamps after 2038... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CPPFLAGS option for timestamps after 2038" >&5
+printf %s "checking for $CPPFLAGS option for timestamps after 2038... " >&6; }
if test ${ac_cv_sys_year2038_opts+y}
then :
printf %s "(cached) " >&6
diff --git a/m4/version.m4 b/m4/version.m4
index 414b6a312..bc51ad53e 100644
--- a/m4/version.m4
+++ b/m4/version.m4
@@ -28,7 +28,7 @@ m4_define([magick_major_version], [7])
m4_define([magick_minor_version], [1])
m4_define([magick_micro_version], [2])
m4_define([magick_patchlevel_version], [26])
-m4_define([magick_is_beta], [y])
+m4_define([magick_is_beta], [n])
m4_define([magick_bugreport],
[https://github.com/ImageMagick/ImageMagick/issues])
m4_define([magick_url], [https://imagemagick.org])