Fix build on ia64/amd64/sparc64

Obtained from:	http://ftp.pld-linux.org/pool/l/libEMF/libEMF-1.0-2.src.rpm

2 files changed, 71 insertions, 25 deletions

diff --git a/graphics/libemf/files/patch-include+wine+winnt.h b/graphics/libemf/files/patch-include+wine+winnt.h
new file mode 100644
index 000000000000..a82512f71a83
--- /dev/null
+++ b/graphics/libemf/files/patch-include+wine+winnt.h
@@ -0,0 +1,51 @@
+--- include/wine/winnt.h.orig	Tue Jan 29 13:31:53 2002
++++ include/wine/winnt.h	Wed Mar 17 20:00:59 2004
+@@ -45,6 +45,18 @@
+ # undef WORDS_BIGENDIAN
+ # undef BITFIELDS_BIGENDIAN
+ # undef ALLOW_UNALIGNED_ACCESS
++#elif defined(__amd64__)
++# undef  WORDS_BIGENDIAN
++# undef  BITFIELDS_BIGENDIAN
++# define ALLOW_UNALIGNED_ACCESS
++#elif defined(__ia64__)
++# undef  WORDS_BIGENDIAN
++# undef  BITFIELDS_BIGENDIAN
++# define ALLOW_UNALIGNED_ACCESS
++#elif defined(__sparc64__)
++# undef  WORDS_BIGENDIAN
++# undef  BITFIELDS_BIGENDIAN
++# define ALLOW_UNALIGNED_ACCESS
+ #elif !defined(RC_INVOKED)
+ # error Unknown CPU architecture!
+ #endif
+@@ -211,7 +223,7 @@
+ typedef unsigned short  WORD,       *PWORD,    *LPWORD;
+ typedef int             INT,        *PINT,     *LPINT;
+ typedef unsigned int    UINT,       *PUINT,    *LPUINT;
+-#if !defined(__alpha__)
++#if !defined(__alpha__) && !defined(__amd64__) && !defined(__ia64__) && !defined(__sparc64__)
+ typedef unsigned long   DWORD,      *PDWORD,   *LPDWORD;
+ typedef unsigned long   ULONG,      *PULONG,   *LPULONG;
+ #else /* defined( __alpha__ ) */
+@@ -257,7 +269,7 @@
+ typedef BYTE            BOOLEAN,    *PBOOLEAN;
+ typedef char            CHAR,       *PCHAR;
+ typedef short           SHORT,      *PSHORT;
+-#if !defined(__alpha__)
++#if !defined(__alpha__) && !defined(__amd64__) && !defined(__ia64__) && !defined(__sparc64__)
+ typedef long            LONG,       *PLONG,    *LPLONG;
+ #else /* defined( __alpha__ ) */
+ typedef int             LONG,       *PLONG,    *LPLONG;
+@@ -1044,6 +1056,11 @@
+ } CONTEXT;
+ 
+ #endif  /* __sparc__ */
++
++#if defined(__amd64__) || defined(__ia64__) || defined(__sparc64__)
++#define CONTEXT_FULL 1
++typedef struct _CONTEXT CONTEXT;
++#endif
+ 
+ #if !defined(CONTEXT_FULL) && !defined(RC_INVOKED)
+ #error You need to define a CONTEXT for your CPU
diff --git a/graphics/libemf/files/patch-libemf+libemf.h b/graphics/libemf/files/patch-libemf+libemf.h
index 2f7fe8edd0c9..c68bd22daa43 100644
--- a/graphics/libemf/files/patch-libemf+libemf.h
+++ b/graphics/libemf/files/patch-libemf+libemf.h
@@ -1,25 +1,20 @@
---- libemf/libemf.h.orig	Tue Jan 29 13:54:27 2002
-+++ libemf/libemf.h	Fri Oct 24 17:04:27 2003
-@@ -21,16 +21,22 @@
- #ifndef _LIBEMF_H
- #define _LIBEMF_H 1
- 
-+#include <iostream>
- #include <cmath>
- #include <vector>
- #include <map>
- #include <functional>
-+#if __GNUC__ > 2
-+#include <backward/function.h>
-+#endif
- #include <algorithm>
- 
- #include <config.h>
- #include <emf.h>
- 
- #include <wine/w16.h>
-+
-+using namespace std;
- 
- namespace EMF {
-   /*!
+--- libemf/libemf.h.orig	Wed Mar 17 20:00:10 2004
++++ libemf/libemf.h	Wed Mar 17 20:00:10 2004
+@@ -338,7 +338,7 @@
+ 	fread( &dword, sizeof(DWORD), 1, fp_ );
+       return *this;
+     }
+-#if !defined(__alpha__)
++#if !defined(__alpha__) && !defined(__amd64__) && !defined(__ia64__) && !defined(__sparc64__)
+     /*!
+      * Output a long int to the stream (swabbed).
+      * \param long long int to output.
+@@ -408,7 +408,7 @@
+ 	fread( &int_, sizeof(INT), 1, fp_ );
+       return *this;
+     }
+-#if !defined(__alpha__)
++#if !defined(__alpha__) && !defined(__amd64__) && !defined(__ia64__) && !defined(__sparc64__)
+     /*!
+      * Output a (long) unsigned int to the stream (swabbed).
+      * \param uint (long) unsigned int to output.