summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2024-03-09 10:39:23 +0100
committerConrad Kostecki <conikost@gentoo.org>2024-03-16 13:13:21 +0100
commit49ae1e7bdcfe2bb9164f41ee6050f577c3296829 (patch)
tree162a4f242e802d16949e62491421f92695edfb50 /media-gfx/imagemagick
parentmedia-gfx/digikam: remove unused patches (diff)
downloadgentoo-49ae1e7bdcfe2bb9164f41ee6050f577c3296829.tar.gz
gentoo-49ae1e7bdcfe2bb9164f41ee6050f577c3296829.tar.bz2
gentoo-49ae1e7bdcfe2bb9164f41ee6050f577c3296829.zip
media-gfx/imagemagick: remove unused patch/file
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'media-gfx/imagemagick')
-rw-r--r--media-gfx/imagemagick/files/imagemagick-7.1.1.24-c99.patch47
-rw-r--r--media-gfx/imagemagick/files/policy-hardening.snippet9
2 files changed, 0 insertions, 56 deletions
diff --git a/media-gfx/imagemagick/files/imagemagick-7.1.1.24-c99.patch b/media-gfx/imagemagick/files/imagemagick-7.1.1.24-c99.patch
deleted file mode 100644
index affcb61f1fed..000000000000
--- a/media-gfx/imagemagick/files/imagemagick-7.1.1.24-c99.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://bugs.gentoo.org/920788
-
-From f6e90ad1a649c4032b957fa101d30c14de3b7e5d Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 27 Dec 2023 22:37:42 +0000
-Subject: [PATCH] configure.ac: fixup LFS check for autoconf-2.72
-
-There are two problems with the check:
-1) The 'unknown' case has a problem which is rejected by stricter C compilers
-because it has -Wimplicit-int and -Wimplicit-function-declaration warnings. Fix that.
-
-2) 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 added a hack for 2) to preserve the old behavior.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- configure.ac | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 57c21edb77..99aa9c21af 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -503,7 +503,8 @@ if test "$enable_largefile" != no; then
- unknown)
- AC_MSG_CHECKING([for native large file support])
- AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <unistd.h>
-- main () {
-+ #include <stdlib.h>
-+ int main () {
- exit(!(sizeof(off_t) == 8));
- }])],
- [ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
-@@ -511,6 +512,9 @@ if test "$enable_largefile" != no; then
- [AC_MSG_RESULT([no])])
- ;;
- *)
-+ if test "$ac_cv_sys_file_offset_bits" = ''; then
-+ ac_cv_sys_file_offset_bits=64;
-+ fi
- LFS_CPPFLAGS="$LFS_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
- ;;
- esac
diff --git a/media-gfx/imagemagick/files/policy-hardening.snippet b/media-gfx/imagemagick/files/policy-hardening.snippet
deleted file mode 100644
index c1a91b0b8744..000000000000
--- a/media-gfx/imagemagick/files/policy-hardening.snippet
+++ /dev/null
@@ -1,9 +0,0 @@
-<policymap>
- <!-- https://www.kb.cert.org/vuls/id/332928 mitigation / https://bugs.gentoo.org/664236 -->
- <policy domain="coder" rights="none" pattern="PS" />
- <policy domain="coder" rights="none" pattern="PS2" />
- <policy domain="coder" rights="none" pattern="PS3" />
- <policy domain="coder" rights="none" pattern="EPS" />
- <policy domain="coder" rights="none" pattern="PDF" />
- <policy domain="coder" rights="none" pattern="XPS" />
-