diff --git a/devel/qt5-script/Makefile b/devel/qt5-script/Makefile index cd8e2cddefbc..5fbf625428c9 100644 --- a/devel/qt5-script/Makefile +++ b/devel/qt5-script/Makefile @@ -1,29 +1,29 @@ PORTNAME= script PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4-compatible scripting module USES= compiler:c++11-lang perl5 qmake qt-dist:5,script USE_PERL5= extract USE_QT= core buildtools:build # Keep make(1) from descending into src/script/obj/ (qmake:outsource # doesn't work). MAKE_ENV= MAKEOBJDIR=. # Source version from qt-dist.mk QT5_VERSION= ${_KDE_script_VERSION} post-patch: @${REINPLACE_CMD} -e '/scripttools/ d' \ ${WRKSRC}/src/src.pro # Fix version mismatches for CMake post-configure: @${REINPLACE_CMD} -e '/${QT5_VERSION} $${_Qt5Script_FIND_VERSION_EXACT}/s|${QT5_VERSION}|'"$$(${MAKE} -C ../qt5-core -VQT5_VERSION)"'|' \ ${WRKSRC}/lib/cmake/Qt5Script/Qt5ScriptConfig.cmake .include diff --git a/devel/qt5-script/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_CallFrame.h b/devel/qt5-script/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_CallFrame.h new file mode 100644 index 000000000000..bce9105b6145 --- /dev/null +++ b/devel/qt5-script/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_CallFrame.h @@ -0,0 +1,15 @@ +Index: src/3rdparty/javascriptcore/JavaScriptCore/interpreter/CallFrame.h +--- src/3rdparty/javascriptcore/JavaScriptCore/interpreter/CallFrame.h.orig ++++ src/3rdparty/javascriptcore/JavaScriptCore/interpreter/CallFrame.h +@@ -135,9 +135,11 @@ namespace JSC { + static CallFrame* noCaller() { return reinterpret_cast(HostCallFrameFlag); } + int returnValueRegister() const { return this[RegisterFile::ReturnValueRegister].i(); } + ++#pragma clang optimize off + bool hasHostCallFrameFlag() const { return reinterpret_cast(this) & HostCallFrameFlag; } + CallFrame* addHostCallFrameFlag() const { return reinterpret_cast(reinterpret_cast(this) | HostCallFrameFlag); } + CallFrame* removeHostCallFrameFlag() { return reinterpret_cast(reinterpret_cast(this) & ~HostCallFrameFlag); } ++#pragma clang optimize on + + private: + void setArgumentCount(int count) { static_cast(this)[RegisterFile::ArgumentCount] = Register::withInt(count); }