revert "fix QtScript JIT crash" patch, causes frequent segmentation faults (#853587)

This commit is contained in:
Rex Dieter 2012-09-04 09:52:55 -05:00
parent 5d4c00ca2f
commit 4f64405c27

View File

@ -16,7 +16,7 @@ Summary: Qt toolkit
Name: qt Name: qt
Epoch: 1 Epoch: 1
Version: 4.8.2 Version: 4.8.2
Release: 5%{?dist} Release: 6%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@ -125,6 +125,7 @@ Patch102: qt-everywhere-opensource-src-4.8.1-type.patch
# fix JIT crash # fix JIT crash
# https://bugreports.qt-project.org/browse/QTBUG-23871 # https://bugreports.qt-project.org/browse/QTBUG-23871
# https://bugs.kde.org/show_bug.cgi?id=297661 # https://bugs.kde.org/show_bug.cgi?id=297661
# REVERT for now, http://bugzilla.redhat.com/853587
Patch103: qt-Fix-JIT-crash-on-x86-64-avoid-32-bit-branch-offset-o.patch Patch103: qt-Fix-JIT-crash-on-x86-64-avoid-32-bit-branch-offset-o.patch
# security patches # security patches
@ -469,7 +470,7 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
%patch100 -p1 -b .QTgaHandler %patch100 -p1 -b .QTgaHandler
%patch101 -p1 -b .fix_cursor_blink %patch101 -p1 -b .fix_cursor_blink
%patch102 -p1 -b .bigendian %patch102 -p1 -b .bigendian
%patch103 -p1 -b .QtScript_JIT #patch103 -p1 -b .QtScript_JIT
# security fixes # security fixes
%patch200 -p1 -b .CVE-2011-3922 %patch200 -p1 -b .CVE-2011-3922
@ -1101,6 +1102,9 @@ fi
%changelog %changelog
* Tue Sep 04 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.2-6
- revert "fix QtScript JIT crash" patch, causes frequent segmentation faults (#853587)
* Mon Aug 13 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.2-5 * Mon Aug 13 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.2-5
- fix QtScript JIT crash (QTBUG-23871, kde#297661) - fix QtScript JIT crash (QTBUG-23871, kde#297661)