ImageMagick-link.patch

   1 --- ImageMagick-7.0.8-68/configure.ac.orig      2019-10-06 00:26:07.000000000 +0200
   2 +++ ImageMagick-7.0.8-68/configure.ac   2019-10-26 20:30:22.370870651 +0200
   3 @@ -1649,7 +1649,7 @@
   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
  12 @@ -1676,7 +1676,7 @@
  13      #
  14      AC_CHECK_LIB([Xext],[XShapeCombineMask],[XEXT_LIBS='-lXext' ; AC_DEFINE(HAVE_SHAPE,1,X11 server supports shape extension)],[],[])
  15      AC_CHECK_LIB(Xt,XtSetEventDispatcher,XT_LIBS='-lXt',,)
  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'
  21 @@ -4016,9 +4016,9 @@
  22  #
  23
  24  if test "$build_modules" != 'no'; then
  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 $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $WS2_32_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 $WS2_32_LIBS $MATH_LIBS          $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS $TCMALLOC_LIBS"
  27  else
  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 $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $WS2_32_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 $ZSTD_LIBS            $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS          $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS $TCMALLOC_LIBS"
  30  fi
  31  MAGICK_EXTRA_DEP_LIBS="$GOMP_LIBS"
  32  AC_SUBST(MAGICK_DEP_LIBS)
  33 --- ImageMagick-6.9.10-19/coders/Makefile.am.orig       2018-12-20 00:48:40.000000000 +0100
  34 +++ ImageMagick-6.9.10-19/coders/Makefile.am    2018-12-22 10:26:05.633992165 +0100
  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
 105 @@ -1008,7 +1008,7 @@
 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)
 110 +coders_url_la_LIBADD       = $(MAGICKCORE_LIBS) $(XML_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
 111
 112  # UYVY coder module
 113  coders_uyvy_la_SOURCES     = coders/uyvy.c