Hello community,
here is the log from the commit of package libqt4 for openSUSE:Factory
checked in at Fri Feb 5 13:59:27 CET 2010.
--------
--- libqt4/libqt4.changes 2010-01-20 17:17:23.000000000 +0100
+++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2010-02-04 11:17:51.000000000 +0100
@@ -1,0 +2,10 @@
+Wed Feb 3 17:19:37 CET 2010 - dmueller(a)suse.de
+
+- fix QAtomic related corruptions on s390 (bnc#573503)
+
+-------------------------------------------------------------------
+Mon Feb 1 17:09:48 CET 2010 - dmueller(a)suse.de
+
+- fix QSslCertificate::subjectInfo() (QtBug-6466)
+
+-------------------------------------------------------------------
libqt4-devel-doc.changes: same change
libqt4-devel-doc-data.changes: same change
libqt4-sql-plugins.changes: same change
calling whatdependson for head-i586
New:
----
ppc64-webkit-link-fix.diff
qsslcertificate-subjectinfo-fix.diff
s390-qatomic-fixes.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt4-devel-doc-data.spec ++++++
--- /var/tmp/diff_new_pack.1w8RPo/_old 2010-02-05 13:58:33.000000000 +0100
+++ /var/tmp/diff_new_pack.1w8RPo/_new 2010-02-05 13:58:33.000000000 +0100
@@ -28,7 +28,7 @@
# COMMON-VERSION-BEGIN
# COMMON-VERSION-BEGIN
Version: 4.6.1
-Release: 1
+Release: 2
%define base_name libqt4
%define x11_free -everywhere-opensource-src-
%define rversion 4.6.1
@@ -71,6 +71,9 @@
Patch107: webkit-ia64_s390x.patch
Patch108: minimal-toc-for-webkit.diff
Patch109: libqt4-libtool-nodate.diff
+Patch111: qsslcertificate-subjectinfo-fix.diff
+Patch112: s390-qatomic-fixes.diff
+Patch113: ppc64-webkit-link-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle
%define check_config \
@@ -118,6 +121,9 @@
%patch107
%patch108
%patch109
+%patch111 -p1
+%patch112
+%patch113
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
# COMMON-END
libqt4-devel-doc.spec: same change
++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.1w8RPo/_old 2010-02-05 13:58:33.000000000 +0100
+++ /var/tmp/diff_new_pack.1w8RPo/_new 2010-02-05 13:58:33.000000000 +0100
@@ -54,7 +54,7 @@
Obsoletes: libqt4-dbus-1 < 4.4.0
# COMMON-VERSION-BEGIN
Version: 4.6.1
-Release: 1
+Release: 2
%define base_name libqt4
%define x11_free -everywhere-opensource-src-
%define rversion 4.6.1
@@ -88,6 +88,9 @@
Patch107: webkit-ia64_s390x.patch
Patch108: minimal-toc-for-webkit.diff
Patch109: libqt4-libtool-nodate.diff
+Patch111: qsslcertificate-subjectinfo-fix.diff
+Patch112: s390-qatomic-fixes.diff
+Patch113: ppc64-webkit-link-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle
%define check_config \
@@ -135,6 +138,9 @@
%patch107
%patch108
%patch109
+%patch111 -p1
+%patch112
+%patch113
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
# COMMON-END
++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.1w8RPo/_old 2010-02-05 13:58:33.000000000 +0100
+++ /var/tmp/diff_new_pack.1w8RPo/_new 2010-02-05 13:58:33.000000000 +0100
@@ -29,7 +29,7 @@
# COMMON-VERSION-BEGIN
# COMMON-VERSION-BEGIN
Version: 4.6.1
-Release: 1
+Release: 2
%define base_name libqt4
%define x11_free -everywhere-opensource-src-
%define rversion 4.6.1
@@ -70,6 +70,9 @@
Patch107: webkit-ia64_s390x.patch
Patch108: minimal-toc-for-webkit.diff
Patch109: libqt4-libtool-nodate.diff
+Patch111: qsslcertificate-subjectinfo-fix.diff
+Patch112: s390-qatomic-fixes.diff
+Patch113: ppc64-webkit-link-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle
%define check_config \
@@ -117,6 +120,9 @@
%patch107
%patch108
%patch109
+%patch111 -p1
+%patch112
+%patch113
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
# COMMON-END
++++++ ppc64-webkit-link-fix.diff ++++++
--- src/3rdparty/webkit/WebCore/WebCore.pro
+++ src/3rdparty/webkit/WebCore/WebCore.pro
@@ -60,7 +60,6 @@
}
unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
-unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
CONFIG(release):!CONFIG(QTDIR_build) {
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
++++++ qsslcertificate-subjectinfo-fix.diff ++++++
commit 102f415e39772086e9066f2e9954c0c22725a23e
Author: Markus Goetz <Markus.Goetz(a)nokia.com>
Date: Mon Jan 18 16:01:14 2010 +0100
Fix QSslCertificate issues
Thank you Matthew Cattell for the fix!
Task-number: QTBUG-6466
Reviewed-by: joao
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index dd50c38..8993e72 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -304,6 +304,7 @@ static QString _q_SubjectInfoToString(QSslCertificate::SubjectInfo info)
*/
QString QSslCertificate::issuerInfo(SubjectInfo info) const
{
+ // lazy init
if (d->issuerInfo.isEmpty() && d->x509)
d->issuerInfo =
_q_mapFromOnelineName(q_X509_NAME_oneline(q_X509_get_issuer_name(d->x509), 0, 0));
@@ -320,7 +321,11 @@ QString QSslCertificate::issuerInfo(SubjectInfo info) const
*/
QString QSslCertificate::issuerInfo(const QByteArray &tag) const
{
- // ### Use a QByteArray for the keys in the map
+ // lazy init
+ if (d->issuerInfo.isEmpty() && d->x509)
+ d->issuerInfo =
+ _q_mapFromOnelineName(q_X509_NAME_oneline(q_X509_get_issuer_name(d->x509), 0, 0));
+
return d->issuerInfo.value(QString::fromLatin1(tag));
}
@@ -335,6 +340,7 @@ QString QSslCertificate::issuerInfo(const QByteArray &tag) const
*/
QString QSslCertificate::subjectInfo(SubjectInfo info) const
{
+ // lazy init
if (d->subjectInfo.isEmpty() && d->x509)
d->subjectInfo =
_q_mapFromOnelineName(q_X509_NAME_oneline(q_X509_get_subject_name(d->x509), 0, 0));
@@ -350,7 +356,11 @@ QString QSslCertificate::subjectInfo(SubjectInfo info) const
*/
QString QSslCertificate::subjectInfo(const QByteArray &tag) const
{
- // ### Use a QByteArray for the keys in the map
+ // lazy init
+ if (d->subjectInfo.isEmpty() && d->x509)
+ d->subjectInfo =
+ _q_mapFromOnelineName(q_X509_NAME_oneline(q_X509_get_subject_name(d->x509), 0, 0));
+
return d->subjectInfo.value(QString::fromLatin1(tag));
}
++++++ s390-qatomic-fixes.diff ++++++
--- src/corelib/arch/qatomic_s390.h
+++ src/corelib/arch/qatomic_s390.h
@@ -366,11 +366,9 @@
Q_INLINE_TEMPLATE T* QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
{
#ifndef __s390x__
- return (T*)__CS_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (int)newValue, "lr",
- "", "bcr 15,0\n");
+ return (T*)__CS_OLD_LOOP(&_q_value, (int)newValue, "lr", "", "");
#else
- return (T*)__CSG_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (long)newValue, "lgr",
- "", "bcr 15,0\n");
+ return (T*)__CSG_OLD_LOOP(&_q_value, (long)newValue, "lgr", "", "");
#endif
}
@@ -378,9 +376,9 @@
Q_INLINE_TEMPLATE T* QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue)
{
#ifndef __s390x__
- return (T*)__CS_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (int)newValue, "lr", "", "");
+ return (T*)__CS_OLD_LOOP(&_q_value, (int)newValue, "lr", "", "bcr 15,0 \n");
#else
- return (T*)__CSG_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (long)newValue, "lgr", "", "");
+ return (T*)__CSG_OLD_LOOP(&_q_value, (long)newValue, "lgr", "", "bcr 15,0 \n");
#endif
}
@@ -388,11 +386,9 @@
Q_INLINE_TEMPLATE T* QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)
{
#ifndef __s390x__
- return (T*)__CS_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (int)newValue, "lr",
- "bcr 15,0 \n", "");
+ return (T*)__CS_OLD_LOOP(&_q_value, (int)newValue, "lr", "bcr 15,0 \n", "");
#else
- return (T*)__CSG_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (long)newValue, "lgr",
- "bcr 15,0\n", "");
+ return (T*)__CSG_OLD_LOOP(&_q_value, (long)newValue, "lgr", "bcr 15,0\n", "");
#endif
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
