view src/msvc-tiff-1.patch @ 6113:24e29dcb2e64

Qt5: Update to version 5.15.3. * src/qtbase.mk: Update version and checksum. * src/qtbase-2-gcc11.patch: Remove hunks from patch that have been applied upstream. * src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk, src/qttranslationse.mk: Update checksum.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 05 Mar 2022 10:59:53 +0100
parents 14afb4dd1939
children
line wrap: on
line source

diff -ur tiff-4.0.3-orig/libtiff/Makefile.in tiff-4.0.3/libtiff/Makefile.in
--- tiff-4.0.3-orig/libtiff/Makefile.in	2012-09-22 12:08:19 -0400
+++ tiff-4.0.3/libtiff/Makefile.in	2013-06-26 22:40:20 -0400
@@ -423,10 +423,12 @@
 
 lib_LTLIBRARIES = libtiff.la $(am__append_6)
 libtiff_la_LDFLAGS = -no-undefined -version-info \
-	$(LIBTIFF_VERSION_INFO) $(am__append_7) $(am__append_8)
+	$(LIBTIFF_VERSION_INFO) $(am__append_7) $(am__append_8) \
+	-export-symbols-regex "xXx" -Wl,libtiff.def
 libtiff_la_LIBADD = $(LIBPORT)
 libtiffxx_la_LDFLAGS = -no-undefined -version-info \
-	$(LIBTIFF_VERSION_INFO) $(am__append_9) $(am__append_10)
+	$(LIBTIFF_VERSION_INFO) $(am__append_9) $(am__append_10) \
+	-export-symbols-regex "xXx"
 libtiffxx_la_LIBADD = $(LIBTIFF) $(LIBPORT)
 libtiffxx_la_DEPENDENCIES = libtiff.la
 mkg3states_SOURCES = mkg3states.c tif_fax3.h
diff -ur tiff-4.0.3-orig/libtiff/tif_stream.cxx tiff-4.0.3/libtiff/tif_stream.cxx
--- tiff-4.0.3-orig/libtiff/tif_stream.cxx	2010-12-13 20:45:44 -0500
+++ tiff-4.0.3/libtiff/tif_stream.cxx	2013-06-26 22:31:55 -0400
@@ -392,6 +392,9 @@
 
 } /* extern "C" */
 
+#ifdef _MSC_VER
+__declspec(dllexport)
+#endif
 TIFF*
 TIFFStreamOpen(const char* name, ostream *os)
 {
@@ -408,6 +411,9 @@
 	return _tiffStreamOpen(name, "wm", os);
 }
 
+#ifdef _MSC_VER
+__declspec(dllexport)
+#endif
 TIFF*
 TIFFStreamOpen(const char* name, istream *is)
 {
diff -ur tiff-4.0.3-orig/libtiff/tiffiop.h tiff-4.0.3/libtiff/tiffiop.h
--- tiff-4.0.3-orig/libtiff/tiffiop.h	2012-06-06 09:35:23 -0400
+++ tiff-4.0.3/libtiff/tiffiop.h	2013-06-26 22:35:20 -0400
@@ -72,6 +72,10 @@
 #define	FALSE	0
 #endif
 
+#if defined(_MSC_VER) && !defined(snprintf)
+#define snprintf _snprintf
+#endif
+
 typedef struct client_info {
     struct client_info *next;
     void *data;