cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Qt4 build on sparc64 with two patches from pkgsrc in qtwebkit part.

Browse Source 
ok espie@
This commit is contained in:
landry 2010-06-15 21:27:57 +00:00
parent aaadc7ef3b
commit 2a31596035
3 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/qt4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.72 2010/05/26 11:34:13 dcoppa Exp $
# $OpenBSD: Makefile,v 1.73 2010/06/15 21:27:57 landry Exp $
USE_GMAKE = Yes
COMMENT-debug = C++ GUI toolkit, debug
@ -18,7 +18,7 @@ PKGNAME-examples = qt4-examples-${PKGVERSION}
PKGNAME-sqlite2 = qt4-sqlite2-${PKGVERSION}
PKGNAME-sqlite = qt4-sqlite-${PKGVERSION}
PKGNAME-tds = qt4-tds-${PKGVERSION}
PKGNAME-main = qt4-${VERSION}p2
PKGNAME-main = qt4-${VERSION}p3
PKGNAME-debug = qt4-debug-${PKGVERSION}p0
FULLPKGNAME-html = qt4-html-${PKGVERSION}
FULLPKGPATH-html = ${BASE_PKGPATH},-html

22
x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue_h Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue_h,v 1.1 2010/06/15 21:27:57 landry Exp $
Fix build on sparc64, from netbsd x11/qt4-libs/patches/path-au
--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h.orig Thu Jun 10 13:39:11 2010
+++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h Thu Jun 10 13:39:29 2010
@@ -468,7 +468,7 @@ namespace JSC {
u.asBits.tag = CellTag;
else
u.asBits.tag = EmptyValueTag;
- u.asBits.payload = reinterpret_cast<int32_t>(ptr);
+ u.asBits.payload = reinterpret_cast<intptr_t>(ptr);
}
inline JSValue::JSValue(const JSCell* ptr)
@@ -477,7 +477,7 @@ namespace JSC {
u.asBits.tag = CellTag;
else
u.asBits.tag = EmptyValueTag;
- u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
+ u.asBits.payload = reinterpret_cast<intptr_t>(const_cast<JSCell*>(ptr));
}
inline JSValue::operator bool() const

22
x11/qt4/patches/patch-src_3rdparty_webkit_JavaScriptCore_runtime_JSValue_h Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-src_3rdparty_webkit_JavaScriptCore_runtime_JSValue_h,v 1.1 2010/06/15 21:27:57 landry Exp $
Fix build on sparc64, from netbsd x11/qt4-libs/patches/path-az
--- src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h.orig Thu Jun 10 13:38:28 2010
+++ src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h Thu Jun 10 13:38:54 2010
@@ -476,7 +476,7 @@ namespace JSC {
u.asBits.tag = CellTag;
else
u.asBits.tag = EmptyValueTag;
- u.asBits.payload = reinterpret_cast<int32_t>(ptr);
+ u.asBits.payload = reinterpret_cast<intptr_t>(ptr);
}
inline JSValue::JSValue(const JSCell* ptr)
@@ -485,7 +485,7 @@ namespace JSC {
u.asBits.tag = CellTag;
else
u.asBits.tag = EmptyValueTag;
- u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
+ u.asBits.payload = reinterpret_cast<intptr_t>(const_cast<JSCell*>(ptr));
}
inline JSValue::operator bool() const