summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authormaho <maho@FreeBSD.org>2004-03-30 15:07:27 +0000
committermaho <maho@FreeBSD.org>2004-03-30 15:07:27 +0000
commitb0adb3aa3c5eb724fa2ebc6dbb6dc864b0a31ecf (patch)
treea3f437e2855ba0efe4d82b7067dd74bbefafd5b1 /graphics
parentec195b96a182e6331ac1e3f40c040c613f1117df (diff)
downloadFreeBSD-ports-b0adb3aa3c5eb724fa2ebc6dbb6dc864b0a31ecf.zip
FreeBSD-ports-b0adb3aa3c5eb724fa2ebc6dbb6dc864b0a31ecf.tar.gz
Fix build on i386, amd64 and ia64
Reported by: Harti Brandt <brandt@fokus.fraunhofer.de> and kris via bento
Diffstat (limited to 'graphics')
-rw-r--r--graphics/libemf/Makefile4
-rw-r--r--graphics/libemf/files/patch-libemf+libemf.h23
2 files changed, 23 insertions, 4 deletions
diff --git a/graphics/libemf/Makefile b/graphics/libemf/Makefile
index 86ca9a2..598babf 100644
--- a/graphics/libemf/Makefile
+++ b/graphics/libemf/Makefile
@@ -17,10 +17,6 @@ GNU_CONFIGURE= yes
.include <bsd.port.pre.mk>
-.if ${ARCH} == "ia64" || ${ARCH} == "amd64"
-BROKEN= "Does not compile on ia64 or amd64"
-.endif
-
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
diff --git a/graphics/libemf/files/patch-libemf+libemf.h b/graphics/libemf/files/patch-libemf+libemf.h
index c68bd22..5455dfe 100644
--- a/graphics/libemf/files/patch-libemf+libemf.h
+++ b/graphics/libemf/files/patch-libemf+libemf.h
@@ -1,5 +1,28 @@
--- libemf/libemf.h.orig Wed Mar 17 20:00:10 2004
+++ libemf/libemf.h Wed Mar 17 20:00:10 2004
+@@ -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 {
+ /*!
@@ -338,7 +338,7 @@
fread( &dword, sizeof(DWORD), 1, fp_ );
return *this;
OpenPOWER on IntegriCloud