[Midnightbsd-cvs] mports [19835] trunk/devel/qt4-script: fix build of qt4 script
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Aug 20 06:58:13 EDT 2015
Revision: 19835
http://svnweb.midnightbsd.org/mports/?rev=19835
Author: laffer1
Date: 2015-08-20 06:58:13 -0400 (Thu, 20 Aug 2015)
Log Message:
-----------
fix build of qt4 script
Modified Paths:
--------------
trunk/devel/qt4-script/Makefile
trunk/devel/qt4-script/pkg-plist
Added Paths:
-----------
trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__runtime__JSValue.h
trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__wtf__Platform.h
trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__wtf__Threading.h
Removed Paths:
-------------
trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__interpreter__Interpreter.cpp
Modified: trunk/devel/qt4-script/Makefile
===================================================================
--- trunk/devel/qt4-script/Makefile 2015-08-20 10:52:45 UTC (rev 19834)
+++ trunk/devel/qt4-script/Makefile 2015-08-20 10:58:13 UTC (rev 19835)
@@ -3,7 +3,8 @@
PORTNAME= script
DISTVERSION= ${QT4_VERSION}
-CATEGORIES?= devel
+PORTREVISION= 1
+CATEGORIES= devel
PKGNAMEPREFIX= qt4-
MAINTAINER= ports at MidnightBSD.org
@@ -10,10 +11,9 @@
COMMENT= Qt script
LICENSE= gpl3
+USES= pkgconfig
USE_QT4= qmake_build moc_build corelib
-QT_NONSTANDARD= yes
QT_DIST= yes
-MAKE_JOBS_SAFE= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/lib/qt4
Deleted: trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__interpreter__Interpreter.cpp
===================================================================
--- trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__interpreter__Interpreter.cpp 2015-08-20 10:52:45 UTC (rev 19834)
+++ trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__interpreter__Interpreter.cpp 2015-08-20 10:58:13 UTC (rev 19835)
@@ -1,13 +0,0 @@
---- ./src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp.orig 2011-06-30 00:43:03.155579428 +0200
-+++ ./src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp 2011-06-30 00:43:34.275444696 +0200
-@@ -2493,8 +2493,10 @@
- vPC += OPCODE_LENGTH(op_get_by_pname);
- NEXT_INSTRUCTION();
- }
-+ {
- Identifier propertyName(callFrame, subscript.toString(callFrame));
- result = baseValue.get(callFrame, propertyName);
-+ }
- CHECK_FOR_EXCEPTION();
- callFrame->r(dst) = result;
- vPC += OPCODE_LENGTH(op_get_by_pname);
Added: trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__runtime__JSValue.h
===================================================================
--- trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__runtime__JSValue.h (rev 0)
+++ trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__runtime__JSValue.h 2015-08-20 10:58:13 UTC (rev 19835)
@@ -0,0 +1,26 @@
+--- ./src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h.orig 2012-12-12 20:18:36.000000000 +0100
++++ ./src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h 2012-12-17 02:13:05.073285539 +0100
+@@ -491,7 +491,11 @@
+ u.asBits.tag = CellTag;
+ else
+ u.asBits.tag = EmptyValueTag;
++#if defined(__sparc64__)
++ u.asBits.payload = reinterpret_cast<int64_t>(ptr);
++#else
+ u.asBits.payload = reinterpret_cast<int32_t>(ptr);
++#endif
+ #if ENABLE(JSC_ZOMBIES)
+ ASSERT(!isZombie());
+ #endif
+@@ -503,7 +507,11 @@
+ u.asBits.tag = CellTag;
+ else
+ u.asBits.tag = EmptyValueTag;
++#if defined(__sparc64__)
++ u.asBits.payload = reinterpret_cast<int64_t>(const_cast<JSCell*>(ptr));
++#else
+ u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
++#endif
+ #if ENABLE(JSC_ZOMBIES)
+ ASSERT(!isZombie());
+ #endif
Property changes on: trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__runtime__JSValue.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__wtf__Platform.h
===================================================================
--- trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__wtf__Platform.h (rev 0)
+++ trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__wtf__Platform.h 2015-08-20 10:58:13 UTC (rev 19835)
@@ -0,0 +1,10 @@
+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2014-04-10 22:37:12.000000000 +0400
++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2014-12-20 07:17:24.000000000 +0300
+@@ -336,7 +336,6 @@
+ /* CPU(MIPS) - MIPS, any version */
+ #if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_))
+ #define WTF_CPU_MIPS 1
+-#include <sgidefs.h>
+ #if defined(__MIPSEB__)
+ #define WTF_CPU_BIG_ENDIAN 1
+ #endif
Property changes on: trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__wtf__Platform.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__wtf__Threading.h
===================================================================
--- trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__wtf__Threading.h (rev 0)
+++ trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__wtf__Threading.h 2015-08-20 10:58:13 UTC (rev 19835)
@@ -0,0 +1,34 @@
+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h.orig 2014-04-10 20:37:12.000000000 +0200
++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 2014-04-24 15:06:18.000000000 +0200
+@@ -71,18 +71,10 @@
+
+ #if OS(WINDOWS) && !OS(WINCE)
+ #include <windows.h>
+-#elif OS(DARWIN)
+-#include <libkern/OSAtomic.h>
+ #elif OS(ANDROID)
+ #include <cutils/atomic.h>
+ #elif OS(QNX)
+ #include <atomic.h>
+-#elif COMPILER(GCC) && !OS(SYMBIAN)
+-#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
+-#include <ext/atomicity.h>
+-#else
+-#include <bits/atomicity.h>
+-#endif
+ #endif
+
+ #if USE(PTHREADS)
+@@ -230,12 +222,6 @@
+ inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(reinterpret_cast<long volatile*>(addend)); }
+ #endif
+
+-#elif OS(DARWIN)
+-#define WTF_USE_LOCKFREE_THREADSAFESHARED 1
+-
+-inline int atomicIncrement(int volatile* addend) { return OSAtomicIncrement32Barrier(const_cast<int*>(addend)); }
+-inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Barrier(const_cast<int*>(addend)); }
+-
+ #elif OS(ANDROID)
+
+ inline int atomicIncrement(int volatile* addend) { return android_atomic_inc(addend); }
Property changes on: trunk/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__wtf__Threading.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/devel/qt4-script/pkg-plist
===================================================================
--- trunk/devel/qt4-script/pkg-plist 2015-08-20 10:52:45 UTC (rev 19834)
+++ trunk/devel/qt4-script/pkg-plist 2015-08-20 10:58:13 UTC (rev 19835)
@@ -1,56 +1,51 @@
-include/qt4/Qt/QtScript
-include/qt4/Qt/qscriptable.h
-include/qt4/Qt/qscriptclass.h
-include/qt4/Qt/qscriptclasspropertyiterator.h
-include/qt4/Qt/qscriptcontext.h
-include/qt4/Qt/qscriptcontextinfo.h
-include/qt4/Qt/qscriptengine.h
-include/qt4/Qt/qscriptengineagent.h
-include/qt4/Qt/qscriptextensioninterface.h
-include/qt4/Qt/qscriptextensionplugin.h
-include/qt4/Qt/qscriptprogram.h
-include/qt4/Qt/qscriptstring.h
-include/qt4/Qt/qscriptvalue.h
-include/qt4/Qt/qscriptvalueiterator.h
-include/qt4/QtScript/QScriptClass
-include/qt4/QtScript/QScriptClassPropertyIterator
-include/qt4/QtScript/QScriptContext
-include/qt4/QtScript/QScriptContextInfo
-include/qt4/QtScript/QScriptContextInfoList
-include/qt4/QtScript/QScriptEngine
-include/qt4/QtScript/QScriptEngineAgent
-include/qt4/QtScript/QScriptExtensionInterface
-include/qt4/QtScript/QScriptExtensionPlugin
-include/qt4/QtScript/QScriptProgram
-include/qt4/QtScript/QScriptString
-include/qt4/QtScript/QScriptSyntaxCheckResult
-include/qt4/QtScript/QScriptValue
-include/qt4/QtScript/QScriptValueIterator
-include/qt4/QtScript/QScriptValueList
-include/qt4/QtScript/QScriptable
-include/qt4/QtScript/QtScript
-include/qt4/QtScript/qscriptable.h
-include/qt4/QtScript/qscriptclass.h
-include/qt4/QtScript/qscriptclasspropertyiterator.h
-include/qt4/QtScript/qscriptcontext.h
-include/qt4/QtScript/qscriptcontextinfo.h
-include/qt4/QtScript/qscriptengine.h
-include/qt4/QtScript/qscriptengineagent.h
-include/qt4/QtScript/qscriptextensioninterface.h
-include/qt4/QtScript/qscriptextensionplugin.h
-include/qt4/QtScript/qscriptprogram.h
-include/qt4/QtScript/qscriptstring.h
-include/qt4/QtScript/qscriptvalue.h
-include/qt4/QtScript/qscriptvalueiterator.h
-lib/qt4/libQtScript.la
-lib/qt4/libQtScript.prl
-lib/qt4/libQtScript.so
-lib/qt4/libQtScript.so.4
-lib/qt4/libQtScript.so.%%SHLIB_SHVER%%
-lib/qt4/libQtScript.so.%%SHLIB_VER%%
-%%DEBUG%%lib/qt4/libQtScript.so.%%SHLIB_VER%%.debug
+%%QT_INCDIR%%/Qt/QtScript
+%%QT_INCDIR%%/Qt/qscriptable.h
+%%QT_INCDIR%%/Qt/qscriptclass.h
+%%QT_INCDIR%%/Qt/qscriptclasspropertyiterator.h
+%%QT_INCDIR%%/Qt/qscriptcontext.h
+%%QT_INCDIR%%/Qt/qscriptcontextinfo.h
+%%QT_INCDIR%%/Qt/qscriptengine.h
+%%QT_INCDIR%%/Qt/qscriptengineagent.h
+%%QT_INCDIR%%/Qt/qscriptextensioninterface.h
+%%QT_INCDIR%%/Qt/qscriptextensionplugin.h
+%%QT_INCDIR%%/Qt/qscriptprogram.h
+%%QT_INCDIR%%/Qt/qscriptstring.h
+%%QT_INCDIR%%/Qt/qscriptvalue.h
+%%QT_INCDIR%%/Qt/qscriptvalueiterator.h
+%%QT_INCDIR%%/QtScript/QScriptClass
+%%QT_INCDIR%%/QtScript/QScriptClassPropertyIterator
+%%QT_INCDIR%%/QtScript/QScriptContext
+%%QT_INCDIR%%/QtScript/QScriptContextInfo
+%%QT_INCDIR%%/QtScript/QScriptContextInfoList
+%%QT_INCDIR%%/QtScript/QScriptEngine
+%%QT_INCDIR%%/QtScript/QScriptEngineAgent
+%%QT_INCDIR%%/QtScript/QScriptExtensionInterface
+%%QT_INCDIR%%/QtScript/QScriptExtensionPlugin
+%%QT_INCDIR%%/QtScript/QScriptProgram
+%%QT_INCDIR%%/QtScript/QScriptString
+%%QT_INCDIR%%/QtScript/QScriptSyntaxCheckResult
+%%QT_INCDIR%%/QtScript/QScriptValue
+%%QT_INCDIR%%/QtScript/QScriptValueIterator
+%%QT_INCDIR%%/QtScript/QScriptValueList
+%%QT_INCDIR%%/QtScript/QScriptable
+%%QT_INCDIR%%/QtScript/QtScript
+%%QT_INCDIR%%/QtScript/qscriptable.h
+%%QT_INCDIR%%/QtScript/qscriptclass.h
+%%QT_INCDIR%%/QtScript/qscriptclasspropertyiterator.h
+%%QT_INCDIR%%/QtScript/qscriptcontext.h
+%%QT_INCDIR%%/QtScript/qscriptcontextinfo.h
+%%QT_INCDIR%%/QtScript/qscriptengine.h
+%%QT_INCDIR%%/QtScript/qscriptengineagent.h
+%%QT_INCDIR%%/QtScript/qscriptextensioninterface.h
+%%QT_INCDIR%%/QtScript/qscriptextensionplugin.h
+%%QT_INCDIR%%/QtScript/qscriptprogram.h
+%%QT_INCDIR%%/QtScript/qscriptstring.h
+%%QT_INCDIR%%/QtScript/qscriptvalue.h
+%%QT_INCDIR%%/QtScript/qscriptvalueiterator.h
+%%QT_LIBDIR%%/libQtScript.prl
+%%QT_LIBDIR%%/libQtScript.so
+%%QT_LIBDIR%%/libQtScript.so.4
+%%QT_LIBDIR%%/libQtScript.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQtScript.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQtScript.so.%%FULLVER%%.debug
libdata/pkgconfig/QtScript.pc
- at dirrmtry lib/qt4
- at dirrm include/qt4/QtScript
- at dirrmtry include/qt4/Qt
- at dirrmtry include/qt4
More information about the Midnightbsd-cvs
mailing list