rpms/qt
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove obsolete patch, now handled by a configure option.

Browse Source
This commit is contained in:
Kevin Kofler 2009-12-23 17:01:29 +00:00
parent 30286e7b96
commit 34eafd78f9
2 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch
View File

@ -1,24 +0,0 @@
diff -up qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri.javascriptcore-disable-jit qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
--- qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri.javascriptcore-disable-jit 2009-09-29 13:01:35.000000000 +0200
+++ qt-x11-opensource-src-4.5.3/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri 2009-10-06 10:39:55.976466622 +0200
@@ -13,20 +13,6 @@ win32-* {
LIBS += -lwinmm
}
-# Disable the JIT due to numerous observed miscompilations :(
-CONFIG(release):isEqual(QT_ARCH,i386) {
- JIT_DEFINES = ENABLE_JIT ENABLE_WREC ENABLE_JIT_OPTIMIZE_CALL ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS ENABLE_JIT_OPTIMIZE_ARITHMETIC
- # Require gcc >= 4.1
- linux-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) {
- DEFINES += $$JIT_DEFINES WTF_USE_JIT_STUB_ARGUMENT_VA_LIST
- QMAKE_CXXFLAGS += -fno-stack-protector
- QMAKE_CFLAGS += -fno-stack-protector
- }
- win32-msvc* {
- DEFINES += $$JIT_DEFINES WTF_USE_JIT_STUB_ARGUMENT_REGISTER
- }
-}
-
win32-msvc*: INCLUDEPATH += $$PWD/os-win32
wince* {
INCLUDEPATH += $$PWD/os-wince

5
qt.spec
View File

@ -47,9 +47,6 @@ Patch21: qt-everywhere-opensource-src-4.6.0-gst-pulsaudio.patch
# use system ca-bundle certs, http://bugzilla.redhat.com/521911 # use system ca-bundle certs, http://bugzilla.redhat.com/521911
Patch22: qt-x11-opensource-src-4.5.3-system_ca_certificates.patch Patch22: qt-x11-opensource-src-4.5.3-system_ca_certificates.patch
Requires: ca-certificates Requires: ca-certificates
# disable JavaScriptCore JIT as it crashes with SE Linux
# http://bugzilla.redhat.com/527079
Patch23: qt-x11-opensource-src-4.5.3-javascript-disable-jit.patch
## upstreamable bits ## upstreamable bits
# http://bugzilla.redhat.com/485677 # http://bugzilla.redhat.com/485677
@ -403,8 +400,6 @@ Qt libraries used for drawing widgets and OpenGL items.
%patch19 -p1 -b .servicesfile %patch19 -p1 -b .servicesfile
%patch21 -p1 -b .gst-pulsaudio %patch21 -p1 -b .gst-pulsaudio
%patch22 -p1 -b .system_ca_certificates %patch22 -p1 -b .system_ca_certificates
## FIXME: ./configure -no-javascript-jit should be sufficient, check
#patch23 -p1 -b .javascriptcore-disable-jit
%patch51 -p1 -b .qdoc3 %patch51 -p1 -b .qdoc3
## FIXME: port patch ## FIXME: port patch
#patch52 -p1 -b .sparc64 #patch52 -p1 -b .sparc64