File ImageMagick-6.8.2.2-mingw.patch of Package mingw64-imagemagick

Overview Repositories Revisions Requests Users Attributes Meta

File ImageMagick-6.8.2.2-mingw.patch of Package mingw64-imagemagick (Revision ccde246b77d1f8fa8a7616a4e3ca5153)

Currently displaying revision ccde246b77d1f8fa8a7616a4e3ca5153 , Show latest

--- ImageMagick-6.8.2-2/coders/svg.c	2012-12-10 14:09:00.000000000 +0100
+++ ImageMagick-6.8.2-2/coders/svg.c	2014-02-25 16:12:34.743004703 +0100
@@ -76,9 +76,7 @@
 #include "magick/utility.h"
 #if defined(MAGICKCORE_XML_DELEGATE)
 #  if defined(MAGICKCORE_WINDOWS_SUPPORT)
-#    if defined(__MINGW32__) || defined(__MINGW64__)
-#      define _MSC_VER
-#    else
+#    if !defined(__MINGW32__) && !defined(__MINGW64__)
 #      include <win32config.h>
 #    endif
 #  endif
--- ImageMagick-6.8.2-2/configure.ac	2013-01-28 18:42:10.000000000 +0100
+++ ImageMagick-6.8.2-2/configure.ac	2014-02-25 16:12:34.744004680 +0100
@@ -98,10 +98,7 @@
 . ${srcdir}/version.sh
 
 echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}${PACKAGE_VERSION_ADDENDUM}"
-AC_CANONICAL_SYSTEM
-AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
 
 MAGICK_TARGET_CPU=$host_cpu
 AC_SUBST(MAGICK_TARGET_CPU)
--- ImageMagick-6.8.2-2/magick/distribute-cache.c	2013-01-29 18:24:50.000000000 +0100
+++ ImageMagick-6.8.2-2/magick/distribute-cache.c	2014-02-25 16:26:53.817972599 +0100
@@ -76,6 +76,10 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #endif
+#if defined(_WIN32)
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#endif
 
 /*
   Define declarations.
--- ImageMagick-6.8.2-2/magick/Makefile.am	2013-01-23 15:45:15.000000000 +0100
+++ ImageMagick-6.8.2-2/magick/Makefile.am	2014-02-25 16:12:34.745004657 +0100
@@ -44,10 +44,10 @@
 
 if WITH_MODULES
 magick_libMagickCore_@MAGICK_ABI_SUFFIX@_la_SOURCES = $(MAGICK_BASE_SRCS) $(MAGICK_PLATFORM_SRCS)
-magick_libMagickCore_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICK_DEP_LIBS)
+magick_libMagickCore_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICK_DEP_LIBS) -lws2_32
 else
 magick_libMagickCore_@MAGICK_ABI_SUFFIX@_la_SOURCES = $(MAGICK_BASE_SRCS) $(MAGICK_PLATFORM_SRCS) $(MAGICK_CODER_SRCS) $(MAGICK_FILTER_SRCS)
-magick_libMagickCore_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICK_DEP_LIBS)
+magick_libMagickCore_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICK_DEP_LIBS) -lws2_32
 endif # WITH_MODULES
 magick_libMagickCore_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS = -I$(top_builddir)/ltdl -I$(top_srcdir)/ltdl $(LIBRARY_EXTRA_CPPFLAGS)

Places

File ImageMagick-6.8.2.2-mingw.patch of Package mingw64-imagemagick (Revision ccde246b77d1f8fa8a7616a4e3ca5153)

Places