gentoo auto-resync : 28:12:2023 - 01:37:43

3 files changed, 28 insertions, 1 deletions

diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 56d6795c05c7..ef8abd193593 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -5,11 +5,12 @@ AUX graphicsmagick-1.3.40-libjpeg-turbo-3-002.patch 1735 BLAKE2B 36514306292a071
 AUX graphicsmagick-1.3.40-libjpeg-turbo-3-003.patch 1232 BLAKE2B 05268740f0774df6dfdafb744922e1dab6d0a6774ea4939c46195fe2f7f56d87fe3e4ca2b46dfa842b2110c56d6c1a77b87977f38936b73ea2d302b47cc03059 SHA512 4385bb7e8129c130d1c5ab2e1a248de6ba4241066bd40fe122a9b67309c03b15151fe8a41acd0c0ec0bc63483bbbb0a49085cc0a6456e72b4b3b822ac1357661
 AUX graphicsmagick-1.3.41-flags.patch 1677 BLAKE2B 43eecb10dd3d45fad8283635144b1ee7c8adfc30d2b75ea597a574d899b57819f5a2c5d33ff68cc547b59af30990bea8a59a674475250055e41e5b70b1087b6c SHA512 2dad1b9b73d7fbd113ac842cabe974f8398ff8c8f2d1a8d7e98a91849a7b2953f2904cfc2d3720dd4096771a5ef0f7fa1744ff35502705f4ac98a1f804caa8e0
 AUX graphicsmagick-1.3.41-perl.patch 482 BLAKE2B 8bdd60e4cc7c5ce7b2f6fac01c069a124148f593b8b4435b8b3a6aa1da644c4cb4e895d12a211a1aab5c4a6b35a4e775f0964961577a289fc1ca59ebdd346e88 SHA512 4e3d50bb32e7ed5ccac9a6e9d3938ab09ce86f1f02f43d02b6108cfa536b19b14a55a1f2ccdb0e1c9bb5c9180b6e37c8a5802193fd6df6a9e905195d0b3f5368
+AUX graphicsmagick-1.3.42-autoconf-2.72-perl-lfs.patch 935 BLAKE2B 2ac2ca646d7c85dc4f372f2ebc863a3555d30a4b8365057bff3a5be730e0b114651b486b1ca57ef65cbc34f904224317a76eaa41d315fb0abf823f2bdd4bea58 SHA512 b31e875dabd10cb34612d408f99e60fe66d36d785b46ed440544cdb7431060d5155729a49580ce152c2aac7935df1cffe2f04725107378aa445f28a99376c788
 DIST GraphicsMagick-1.3.40.tar.xz 5507792 BLAKE2B 2052eb34931f07c902a9c68192ebe4d36137cd23219b1598bae2fa78c5c8bfd1efadf9fd430ed4fee8dc903e50ffabe5a9c76bf55966b85b6f303b2decdca6ee SHA512 e64902aa2a8702d03d188350bd4252a2263e431611f9a70f38cd8beede8a38cc91bb4de3603fedf15420ebbba488f609f218e9b45e356b9f8dc8e4a75f380ee5
 DIST GraphicsMagick-1.3.40.tar.xz.asc 228 BLAKE2B 70eaaa0cd30cfe23ac6dc5e8edc026c57eea7b1a608e83da3408f6fa9fc2cceeb8190e4e9015f321ee688f2a32689d244d69bc61764a99ab0f99ada72143a575 SHA512 82c628e4a260a690c7b1941321881a97d54b4c9580dcbfd8ae786a1774dc43c46e8542488ca875346446858e7475847c440cfca572315a5fe123315b187a240a
 DIST GraphicsMagick-1.3.42.tar.xz 5553692 BLAKE2B f8f0d7d420375262b7db8ffcc1c9eb4e372fb20a7c5e55f566d965183bb9a8d3a20a43c249a0b05235caaa0883c58885329d5c8d1967f464c0b757d40d6fc825 SHA512 b512c9c4c06ec60f7d31e140da08f2bc16d492a2dab82778f1b38c074a25340159e59bfbaa30b2997a6fbd10a500ae1bda527e3c3854e4462bcae837e818428a
 DIST GraphicsMagick-1.3.42.tar.xz.asc 228 BLAKE2B 723f8d1ca13bd5b32a12d69bb46f4991df6e7963f0d4c12ddaf60167a9ade4c6fa36819cce1df202437143bc55e17dd6f2cff821412dafceeb3ab5e3dbf3dc7b SHA512 de5d90c748376e7e480a066e9354ac1771f15cb2d8c6e5c9249672fd811b7bbe06f97b3348240538fa8d0d7c11150f57fb5148285214712944f7535afb943bd0
 EBUILD graphicsmagick-1.3.40-r1.ebuild 4030 BLAKE2B 074c388f51d8d748a3362b0c8189ac1ba66c700186cc670a04ea7929244c3f039b34d780ce7ad2b909cbee700003feabe01e111995748da3bb05167f54d2a8ce SHA512 bb24cbb108394cc5ef855b4de40232032ba8ad73306d45bb906de6e3dbeaeb6d6a9b4eda9d0d8b6381d7a09a09917affbdbf3afb2d4f96f42aa6252c91a423d7
-EBUILD graphicsmagick-1.3.42.ebuild 3872 BLAKE2B 2059beb36e24e17e3e4fb905e480d55413dc0835e1bea3d4fbb5fd3d7d6aa5869ef63c4ce2291343ade7a32af201fa39c7ebebe8409549e9524905ac13ef2b8d SHA512 fca9fb3ad4cff201b0852d45fcac9fc99a8617719702ddfaa6de46a387d75cee50319432b2c7b3c4e24218f458071546aad0cb6e98f51ad23aff8edcc6eeab82
+EBUILD graphicsmagick-1.3.42.ebuild 3929 BLAKE2B 2760f36c100e4e76fab7253becce521d4e2aaa2765bf1b7fef12c2a82ae87f00a26ec8d370505ff8c42bc45c422fb2eec6789693fe196366c513f78d8a0d461e SHA512 90d47141fc69519fc913a39520dded157c01d994333ade9b518f9ae17b75d4c2a34452779f505789e472cdb2bd6da5dd281559425f880bee4e1612285161666a
 EBUILD graphicsmagick-9999.ebuild 3880 BLAKE2B 17ca7c78e6dd99d50c2f7da6d49e3c4bf62733747c62f367e501ee7bada5be1142e26ce829a023ae965acfabc0522d17e38a72ac25b3d356fdfc32d5600847f3 SHA512 babd116e1e3f4119d9cd3e60ffd87d26dbfed4e951a36d2eac26905226ff20363b8f5678c88b0137fbc4ddc3ae0f2e5db69d2db69b8eb3b509545a3b55ed710f
 MISC metadata.xml 1230 BLAKE2B 336c8cf97916b4907c95d16791e785336521c865aee9909129771e9d16405ff92471c56e9adae7ffd5354b769804c7e92bb20c1698c06b4994b73148b345bc6e SHA512 cdf719939c41c7aca942d6dec97d2b7496b345c9f9718b758ee08bc03a6a5afc80c989c0e977be021d292c8bf95007a4c42ef2346bb0c460bb48cacc9970560e
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.42-autoconf-2.72-perl-lfs.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.42-autoconf-2.72-perl-lfs.patch
new file mode 100644
index 000000000000..05e151c1efab
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.42-autoconf-2.72-perl-lfs.patch
@@ -0,0 +1,25 @@
+Sent upstream by mail.
+
+https://bugs.gentoo.org/920788
+https://github.com/ImageMagick/ImageMagick/pull/6978
+
+configure.ac: fixup LFS check for autoconf-2.72
+
+For the 'other' case, we were using the value of ac_cv_sys_file_offset_bits for
+-D_FILE_OFFSET_BITS to pass down into the Perl module build, but autoconf-2.72
+drops the use of ac_cv_sys_file_offset_bits in cf09f48841b66fe76f606dd6018bb3a93242a7c9,
+so this ends up defining '-D_FILE_OFFSET_BITS=' which then breaks the build.
+
+I've just added a hack to preserve the old behaviour to avoid passing a blank
+value.
+--- a/configure.ac
++++ b/configure.ac
+@@ -386,7 +386,7 @@ AC_FUNC_FSEEKO
+ LFS_CPPFLAGS=''
+ if test "$enable_largefile" != no
+ then
+-  if test "$ac_cv_sys_file_offset_bits" != 'no'
++  if test "$ac_cv_sys_file_offset_bits" != 'no' && test -n "$ac_cv_sys_file_offset_bits"
+   then
+     LFS_CPPFLAGS="$LFS_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+   fi
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild
index e06b4db947e2..e95dedd071e0 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.42.ebuild
@@ -68,6 +68,7 @@ BDEPEND+=" virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.41-flags.patch
 	"${FILESDIR}"/${PN}-1.3.41-perl.patch
+	"${FILESDIR}"/${PN}-1.3.42-autoconf-2.72-perl-lfs.patch
 )
 
 pkg_pretend() {