workaround crash on ppc64
This commit is contained in:
parent
5b7dbe9fd5
commit
c4934b1a43
|
@ -0,0 +1,21 @@
|
||||||
|
diff -up qt-4.8/src/corelib/plugin/qlibrary.cpp.crash_ppc qt-4.8/src/corelib/plugin/qlibrary.cpp
|
||||||
|
--- qt-4.8/src/corelib/plugin/qlibrary.cpp.crash_ppc 2011-10-04 05:44:32.000000000 +0200
|
||||||
|
+++ qt-4.8/src/corelib/plugin/qlibrary.cpp 2011-11-30 15:49:44.185001452 +0100
|
||||||
|
@@ -371,7 +371,7 @@ static bool qt_unix_query(const QString
|
||||||
|
long pos = 0;
|
||||||
|
const char pattern[] = "pattern=QT_PLUGIN_VERIFICATION_DATA";
|
||||||
|
const ulong plen = qstrlen(pattern);
|
||||||
|
-#if defined (Q_OF_ELF) && defined(Q_CC_GNU)
|
||||||
|
+#if defined (Q_OF_ELF) && defined(Q_CC_GNU) && !(defined(__powerpc64__) || defined(__ppc64__))
|
||||||
|
int r = QElfParser().parse(filedata, fdlen, library, lib, &pos, &fdlen);
|
||||||
|
if (r == QElfParser::NoQtSection) {
|
||||||
|
if (pos > 0) {
|
||||||
|
@@ -393,7 +393,7 @@ static bool qt_unix_query(const QString
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
pos = qt_find_pattern(filedata, fdlen, pattern, plen);
|
||||||
|
-#endif // defined(Q_OF_ELF) && defined(Q_CC_GNU)
|
||||||
|
+#endif // defined(Q_OF_ELF) && defined(Q_CC_GNU) && !(defined(__powerpc64__) || defined(__ppc64__))
|
||||||
|
bool ret = false;
|
||||||
|
if (pos >= 0)
|
||||||
|
ret = qt_parse_pattern(filedata + pos, version, debug, key);
|
9
qt.spec
9
qt.spec
|
@ -11,7 +11,7 @@ Summary: Qt toolkit
|
||||||
Name: qt
|
Name: qt
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 4.8.0
|
Version: 4.8.0
|
||||||
Release: 0.25.rc1%{?dist}
|
Release: 0.26.rc1%{?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
|
||||||
|
@ -94,6 +94,9 @@ Patch73: qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch
|
||||||
# sql/drivers/tds/qsql_tds.cpp:341:49: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
|
# sql/drivers/tds/qsql_tds.cpp:341:49: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
|
||||||
Patch74: qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch
|
Patch74: qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch
|
||||||
|
|
||||||
|
# workaround crash on ppc64
|
||||||
|
Patch75: qt-ppc64-crash.patch
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
# Applications crash when using a visual with 24 bits per pixel
|
# Applications crash when using a visual with 24 bits per pixel
|
||||||
# https://bugreports.qt.nokia.com/browse/QTBUG-21754
|
# https://bugreports.qt.nokia.com/browse/QTBUG-21754
|
||||||
|
@ -420,6 +423,7 @@ popd
|
||||||
%patch73 -p1 -b .qtwebkit-glib231
|
%patch73 -p1 -b .qtwebkit-glib231
|
||||||
%endif
|
%endif
|
||||||
%patch74 -p1 -b .tds_no_strict_aliasing
|
%patch74 -p1 -b .tds_no_strict_aliasing
|
||||||
|
%patch75 -p1 -b .ppc64-crash
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
%patch100 -p1 -b .QTBUG-21754
|
%patch100 -p1 -b .QTBUG-21754
|
||||||
|
@ -1055,6 +1059,9 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 30 2011 Than Ngo <than@redhat.com> - 4.8.0-0.26.rc1
|
||||||
|
- workaround crash on ppc64
|
||||||
|
|
||||||
* Mon Nov 14 2011 Rex Dieter <rdieter@fedoraproject.org> 4.8.0-0.25.rc1
|
* Mon Nov 14 2011 Rex Dieter <rdieter@fedoraproject.org> 4.8.0-0.25.rc1
|
||||||
- BuildRequires: pkgconfig(libpng)
|
- BuildRequires: pkgconfig(libpng)
|
||||||
- -devel: drop Requires: libpng-devel libjpeg-devel
|
- -devel: drop Requires: libpng-devel libjpeg-devel
|
||||||
|
|
Loading…
Reference in New Issue