]> git.pld-linux.org Git - packages/ImageMagick.git/blame - ImageMagick-link.patch
Up to 7.1.0-60; Fixes CVE-2022-44267, CVE-2022-44268
[packages/ImageMagick.git] / ImageMagick-link.patch
CommitLineData
fa32e604
JB
1--- ImageMagick-7.0.11-14/configure.ac.orig 2021-05-31 15:35:02.000000000 +0200
2+++ ImageMagick-7.0.11-14/configure.ac 2022-04-11 22:17:59.016768289 +0200
3@@ -1491,7 +1491,7 @@ if test "$no_x" != 'yes'; then
e984c4b5
JB
4 AC_MSG_CHECKING([for X11])
5 AC_MSG_RESULT([])
6 LDFLAGS="$LDFLAGS $X_LIBS"
7- X11_LIBS="$X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
8+ X11_LIBS="-lX11 $X_EXTRA_LIBS"
9 LIBS="$X11_LIBS $LIBS"
10 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
11
fa32e604 12@@ -1518,7 +1518,7 @@ if test "$no_x" != 'yes'; then
e984c4b5
JB
13 #
14 AC_CHECK_LIB([Xext],[XShapeCombineMask],[XEXT_LIBS='-lXext' ; AC_DEFINE(HAVE_SHAPE,1,X11 server supports shape extension)],[],[])
3c563119 15 AC_CHECK_LIB([Xt],[XtSetEventDispatcher],[XT_LIBS='-lXt'],[],[])
e984c4b5
JB
16- LIBS="$XEXT_LIBS $XT_LIBS $LIBS"
17+ LIBS="$XEXT_LIBS $LIBS"
18 fi
19 if test "$no_x" != 'yes'; then
20 have_x='yes'
fa32e604 21@@ -3934,9 +3934,9 @@ fi
e984c4b5
JB
22 #
23
24 if test "$build_modules" != 'no'; then
fa32e604
JB
25- MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $XML_LIBS $FLIF_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $BZLIB_LIBS $ZLIB_LIBS $ZIP_LIBS $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS $TCMALLOC_LIBS"
26+ MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $XML_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS $TCMALLOC_LIBS"
e984c4b5 27 else
fa32e604
JB
28- MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $JXL_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_LIBS $FPX_LIBS $FONTCONFIG_LIBS $HEIF_LIBS $WEBPMUX_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RAW_R_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $ZIP_LIBS $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS $TCMALLOC_LIBS"
29+ MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $JXL_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_LIBS $FPX_LIBS $FONTCONFIG_LIBS $HEIF_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RAW_R_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $ZIP_LIBS $ZSTD_LIBS $GDI32_LIBS $MATH_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS $TCMALLOC_LIBS"
e984c4b5
JB
30 fi
31 MAGICK_EXTRA_DEP_LIBS="$GOMP_LIBS"
3c563119 32 AC_SUBST([MAGICK_DEP_LIBS])
c1ffed96
ER
33--- ImageMagick-7.1.0-60/coders/Makefile.am~ 2023-02-03 14:16:08.000000000 +0200
34+++ ImageMagick-7.1.0-60/coders/Makefile.am 2023-02-03 14:17:15.705028893 +0200
e984c4b5
JB
35@@ -468,7 +468,7 @@
36 coders_djvu_la_SOURCES = coders/djvu.c
37 coders_djvu_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
38 coders_djvu_la_LDFLAGS = $(MODULECOMMONFLAGS)
39-coders_djvu_la_LIBADD = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
40+coders_djvu_la_LIBADD = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
41
42 # DNG coder module
43 coders_dng_la_SOURCES = coders/dng.c
44@@ -678,7 +678,7 @@
45 coders_mat_la_SOURCES = coders/mat.c
46 coders_mat_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
47 coders_mat_la_LDFLAGS = $(MODULECOMMONFLAGS)
48-coders_mat_la_LIBADD = $(MAGICKCORE_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
49+coders_mat_la_LIBADD = $(MAGICKCORE_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
50
51 # MATTE coder module
52 coders_matte_la_SOURCES = coders/matte.c
53@@ -726,7 +726,7 @@
54 coders_msl_la_SOURCES = coders/msl.c
55 coders_msl_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
56 coders_msl_la_LDFLAGS = $(MODULECOMMONFLAGS)
57-coders_msl_la_LIBADD = $(MAGICKCORE_LIBS) $(XML_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
58+coders_msl_la_LIBADD = $(MAGICKCORE_LIBS) $(XML_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
59
60 # MTV coder module
61 coders_mtv_la_SOURCES = coders/mtv.c
62@@ -798,7 +798,7 @@
63 coders_pdf_la_SOURCES = coders/pdf.c
64 coders_pdf_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
65 coders_pdf_la_LDFLAGS = $(MODULECOMMONFLAGS)
66-coders_pdf_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(GS_LIBS) $(MATH_LIBS)
67+coders_pdf_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(GS_LIBS) $(MATH_LIBS)
68
69 # PES coder module
70 coders_pes_la_SOURCES = coders/pes.c
71@@ -828,7 +828,7 @@
72 coders_png_la_SOURCES = coders/png.c
73 coders_png_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
74 coders_png_la_LDFLAGS = $(MODULECOMMONFLAGS)
75-coders_png_la_LIBADD = $(MAGICKCORE_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
76+coders_png_la_LIBADD = $(MAGICKCORE_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
77
78 # PLASMA coder module
79 coders_plasma_la_SOURCES = coders/plasma.c
80@@ -858,13 +858,13 @@
81 coders_ps2_la_SOURCES = coders/ps2.c
82 coders_ps2_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
83 coders_ps2_la_LDFLAGS = $(MODULECOMMONFLAGS)
84-coders_ps2_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(ZSTD_LIBS) $(WEBPMUX_LIBS) $(WEBP_LIBS) $(MATH_LIBS)
85+coders_ps2_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(WEBPMUX_LIBS) $(WEBP_LIBS) $(MATH_LIBS)
86
87 # PS3 coder module
88 coders_ps3_la_SOURCES = coders/ps3.c
89 coders_ps3_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
90 coders_ps3_la_LDFLAGS = $(MODULECOMMONFLAGS)
91-coders_ps3_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(ZSTD_LIBS) $(WEBPMUX_LIBS) $(WEBP_LIBS) $(MATH_LIBS)
92+coders_ps3_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(WEBPMUX_LIBS) $(WEBP_LIBS) $(MATH_LIBS)
93
94 # PSD coder module
95 coders_psd_la_SOURCES = coders/psd.c coders/psd-private.h
96@@ -954,7 +954,7 @@
97 coders_svg_la_SOURCES = coders/svg.c
98 coders_svg_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) $(RSVG_CFLAGS) $(CAIRO_SVG_CFLAGS)
99 coders_svg_la_LDFLAGS = $(MODULECOMMONFLAGS)
100-coders_svg_la_LIBADD = $(MAGICKCORE_LIBS) $(AUTOTRACE_LIBS) $(RSVG_LIBS) $(XML_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
101+coders_svg_la_LIBADD = $(MAGICKCORE_LIBS) $(AUTOTRACE_LIBS) $(RSVG_LIBS) $(XML_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
102
103 # TGA coder module
104 coders_tga_la_SOURCES = coders/tga.c
c1ffed96 105@@ -1389,7 +1389,7 @@
e984c4b5
JB
106 coders_url_la_SOURCES = coders/url.c
107 coders_url_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
108 coders_url_la_LDFLAGS = $(MODULECOMMONFLAGS)
109-coders_url_la_LIBADD = $(MAGICKCORE_LIBS) $(XML_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
c1ffed96
ER
110+coders_url_la_LIBADD = $(MAGICKCORE_LIBS) $(XML_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS)
111 if WIN32_NATIVE_BUILD
112 coders_url_la_LIBADD += -lurlmon
113 endif
This page took 0.135344 seconds and 4 git commands to generate.