From 99edab778a7b0fdfb3ecb28a288ead6fe397c500 Mon Sep 17 00:00:00 2001
From: Volker Grabsch <vog@notjusthosting.com>
Date: Wed, 21 Apr 2010 13:42:44 +0200
Subject: cleanup of the "boolean" and "INT32" fixes for package jpeg

---
 src/jpeg-win32.patch | 35 +++++++++++++++++++++++++++++++++++
 src/jpeg.mk          |  2 --
 src/w32api.mk        |  2 --
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 src/jpeg-win32.patch

diff --git a/src/jpeg-win32.patch b/src/jpeg-win32.patch
new file mode 100644
index 0000000..6224ccd
--- /dev/null
+++ b/src/jpeg-win32.patch
@@ -0,0 +1,35 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+diff -r 13edd7b348d4 jmorecfg.h
+--- a/jmorecfg.h	Wed Apr 21 10:15:34 2010 +0200
++++ b/jmorecfg.h	Wed Apr 21 11:36:07 2010 +0200
+@@ -10,6 +10,16 @@
+  * JPEG software for special applications or support machine-dependent
+  * optimizations.  Most users will not need to touch this file.
+  */
++
++
++/*
++ * Load standard definitions on Windows systems to ensure that these
++ * are defined when _building_ as well as _using_ the library.
++ */
++
++#ifdef _WIN32
++#include <windows.h>
++#endif
+ 
+ 
+ /*
+@@ -233,7 +243,11 @@
+  */
+ 
+ #ifndef HAVE_BOOLEAN
++#ifndef _RPCNDR_H_		/* Microsoft defines it in rpcndr.h */
++#ifndef _RPCNDR_H		/* MinGW is slightly different */
+ typedef int boolean;
++#endif
++#endif
+ #endif
+ #ifndef FALSE			/* in case these macros already exist */
+ #define FALSE	0		/* values of boolean */
diff --git a/src/jpeg.mk b/src/jpeg.mk
index 67bcd6f..acfbbed 100644
--- a/src/jpeg.mk
+++ b/src/jpeg.mk
@@ -19,8 +19,6 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    # avoid redefinition of INT32
-    $(SED) -i 's,typedef long INT32;,#include <basetsd.h>,' '$(1)/jmorecfg.h'
     cd '$(1)' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
diff --git a/src/w32api.mk b/src/w32api.mk
index 4986be1..2622449 100644
--- a/src/w32api.mk
+++ b/src/w32api.mk
@@ -19,8 +19,6 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    # fix incompatibilities with jpeg
-    $(SED) -i 's,typedef unsigned char boolean;,,'           '$(1)/include/rpcndr.h'
     $(INSTALL) -d '$(PREFIX)/$(TARGET)'
     cp -rpv '$(1)/include' '$(1)/lib' '$(PREFIX)/$(TARGET)'
 endef
-- 
cgit v0.12