diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2011-12-31 01:53:11 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2011-12-31 01:53:11 +0000 |
| commit | 06afa4a488561307dc12a6caacb9ec6f52a76942 (patch) | |
| tree | ee6de3a11c11bb392229c8926c793685b2d5c557 /x11/kdelibs4 | |
| parent | 051059ffd89ec0165309ddac7378c6400355bac5 (diff) | |
| download | ports-06afa4a488561307dc12a6caacb9ec6f52a76942.tar.gz ports-06afa4a488561307dc12a6caacb9ec6f52a76942.zip | |
Fix build with clang.
Import my commits d1fe207 and 01b0c1a to kdelibs upstream which should fix the
build issues reported in http://article.gmane.org/gmane.comp.kde.freebsd/20432
and http://article.gmane.org/gmane.comp.kde.freebsd/20462.
There is no need for a bump in PORTREVISION, as it only fixes the build for
people who were unable to build it before anyway.
Approved by: avilla (mentor, implicit)
Notes
Notes:
svn path=/head/; revision=288300
Diffstat (limited to 'x11/kdelibs4')
| -rw-r--r-- | x11/kdelibs4/files/patch-kjs__lookup.h | 21 | ||||
| -rw-r--r-- | x11/kdelibs4/files/patch-kjs__wtf__RefPtr.h | 23 |
2 files changed, 44 insertions, 0 deletions
diff --git a/x11/kdelibs4/files/patch-kjs__lookup.h b/x11/kdelibs4/files/patch-kjs__lookup.h new file mode 100644 index 000000000000..900d4c33b35e --- /dev/null +++ b/x11/kdelibs4/files/patch-kjs__lookup.h @@ -0,0 +1,21 @@ +commit d1fe2074b4fbc8253a4533a7e6be24b4f5b20b8b +Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Fri Dec 30 23:25:16 2011 -0200 + + Add missing include. + + Casting from KJS::JSGlobalObject* to KJS::JSObject* failed with clang + because it missed the definition of JSGlobalObject. + +diff --git a/kjs/lookup.h b/kjs/lookup.h +index 6fabc8f..00622d0 100644 +--- ./kjs/lookup.h ++++ ./kjs/lookup.h +@@ -23,6 +23,7 @@ + #ifndef _KJSLOOKUP_H_ + #define _KJSLOOKUP_H_ + ++#include "JSVariableObject.h" + #include "interpreter.h" + #include "identifier.h" + #include "object.h" diff --git a/x11/kdelibs4/files/patch-kjs__wtf__RefPtr.h b/x11/kdelibs4/files/patch-kjs__wtf__RefPtr.h new file mode 100644 index 000000000000..bf54d3f120f8 --- /dev/null +++ b/x11/kdelibs4/files/patch-kjs__wtf__RefPtr.h @@ -0,0 +1,23 @@ +commit 01b0c1a8051f372e400d213ac125311c398e4b17 +Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Fri Dec 30 23:27:31 2011 -0200 + + Add missing include. + + RefPtr::release() needs PassRefPtr.h for adoptRef(). The include is also + present in WebKit's wtf. + + This should fix another build failure with clang. + +diff --git a/kjs/wtf/RefPtr.h b/kjs/wtf/RefPtr.h +index c16397e..493ab05 100644 +--- ./kjs/wtf/RefPtr.h ++++ ./kjs/wtf/RefPtr.h +@@ -24,6 +24,7 @@ + + #include <algorithm> + #include "AlwaysInline.h" ++#include "PassRefPtr.h" + + namespace WTF { + |