Hello community,
here is the log from the commit of package libqt4
checked in at Wed Jul 9 22:56:20 CEST 2008.
--------
--- libqt4/libqt4.changes 2008-06-22 22:18:58.000000000 +0200
+++ libqt4/libqt4.changes 2008-07-08 22:15:19.000000000 +0200
@@ -1,0 +2,17 @@
+Fri Jul 4 13:52:30 CEST 2008 - dmueller@suse.de
+
+- fix postgresql 8.3 support (bnc#403385)
+
+-------------------------------------------------------------------
+Tue Jul 1 15:13:15 CEST 2008 - schwab@suse.de
+
+- Fix memset call.
+- Fix aliasing violation.
+
+-------------------------------------------------------------------
+Thu Jun 26 01:23:03 CEST 2008 - dmueller@suse.de
+
+- add experimental patch to fix QTextStream parsing numbers
+ in system locale
+
+-------------------------------------------------------------------
libqt4-devel-doc-data.changes: same change
libqt4-sql-plugins.changes: same change
libQtWebKit-devel.changes: same change
Old:
----
revert-psql-detection.diff
New:
----
aliasing.diff
memset.diff
postgresql83-support.diff
qtextstream-locale-parsing.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt4-devel-doc-data.spec ++++++
--- /var/tmp/diff_new_pack.a11253/_old 2008-07-09 22:53:29.000000000 +0200
+++ /var/tmp/diff_new_pack.a11253/_new 2008-07-09 22:53:29.000000000 +0200
@@ -28,7 +28,7 @@
# COMMON-BEGIN
# COMMON-BEGIN
Version: 4.4.0
-Release: 15
+Release: 18
%define base_name libqt4
%define x11_free -x11-opensource-src-
%define rversion 4.4.0
@@ -59,7 +59,7 @@
Patch61: qt4-fake-bold.patch
Patch62: qdbus-enable-on-sles10.diff
Patch66: statusbar-recursion.diff
-Patch67: revert-psql-detection.diff
+Patch67: postgresql83-support.diff
Patch68: xim-callback-crash.diff
Patch69: 0223-fix-qpixmap-hasalpha.diff
Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch
@@ -70,6 +70,9 @@
Patch75: qt-debug-timer.diff
Patch76: qt-qfatal-abort.diff
Patch77: qt4-input-method-lazy-load.patch
+Patch78: qtextstream-locale-parsing.diff
+Patch79: aliasing.diff
+Patch80: memset.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
%define common_options -fast -no-separate-debug-info -shared -xkb -tablet -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 -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite
@@ -114,7 +117,7 @@
%endif
%patch62
%patch66
-%patch67
+%patch67 -p1
%patch68
%patch69
%patch70
@@ -125,6 +128,9 @@
%patch75
%patch76
%patch77
+%patch78
+%patch79
+%patch80
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
# COMMON-END
@@ -180,6 +186,14 @@
/usr/share/doc/packages/%base_name/src
%changelog
+* Fri Jul 04 2008 dmueller@suse.de
+- fix postgresql 8.3 support (bnc#403385)
+* Tue Jul 01 2008 schwab@suse.de
+- Fix memset call.
+- Fix aliasing violation.
+* Thu Jun 26 2008 dmueller@suse.de
+- add experimental patch to fix QTextStream parsing numbers
+ in system locale
* Wed Jun 18 2008 mfabian@suse.de
- bnc#398526: add qt4-input-method-lazy-load.patch
by Peng Wu .
++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.a11253/_old 2008-07-09 22:53:29.000000000 +0200
+++ /var/tmp/diff_new_pack.a11253/_new 2008-07-09 22:53:29.000000000 +0200
@@ -34,7 +34,7 @@
Obsoletes: libqt4-dbus-1 < 4.4.0
# COMMON-BEGIN
Version: 4.4.0
-Release: 15
+Release: 18
%define base_name libqt4
%define x11_free -x11-opensource-src-
%define rversion 4.4.0
@@ -65,7 +65,7 @@
Patch61: qt4-fake-bold.patch
Patch62: qdbus-enable-on-sles10.diff
Patch66: statusbar-recursion.diff
-Patch67: revert-psql-detection.diff
+Patch67: postgresql83-support.diff
Patch68: xim-callback-crash.diff
Patch69: 0223-fix-qpixmap-hasalpha.diff
Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch
@@ -76,6 +76,9 @@
Patch75: qt-debug-timer.diff
Patch76: qt-qfatal-abort.diff
Patch77: qt4-input-method-lazy-load.patch
+Patch78: qtextstream-locale-parsing.diff
+Patch79: aliasing.diff
+Patch80: memset.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
%define common_options -fast -no-separate-debug-info -shared -xkb -tablet -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 -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite
@@ -121,7 +124,7 @@
%endif
%patch62
%patch66
-%patch67
+%patch67 -p1
%patch68
%patch69
%patch70
@@ -132,6 +135,9 @@
%patch75
%patch76
%patch77
+%patch78
+%patch79
+%patch80
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
# COMMON-END
@@ -275,8 +281,9 @@
rm $RPM_BUILD_ROOT/usr/bin/{qcollectiongenerator,assistant,assistant_adp}
rm $RPM_BUILD_ROOT/usr/bin/{qhelpconverter,qhelpgenerator}
# some packages expect these symlinks
-ln -s /usr/include/Qt $RPM_BUILD_ROOT/usr/share/qt4/include
-ln -s %_libdir $RPM_BUILD_ROOT/usr/share/qt4/%_lib
+ln -s /usr/include $RPM_BUILD_ROOT/%_libdir/qt4/include
+ln -s %_libdir $RPM_BUILD_ROOT/%_libdir/qt4/lib
+ln -s %plugindir $RPM_BUILD_ROOT/%_libdir/qt4/plugins
#
# install menu entries
#
@@ -318,7 +325,6 @@
%dir %plugindir/imageformats
%dir %plugindir/inputmethods
%dir %plugindir/accessible
-%dir /usr/share/qt4
%dir %_defaultdocdir/%name
%doc %_defaultdocdir/%name/changes-*
%_libdir/libQtCore*.so.*
@@ -389,6 +395,7 @@
%_libdir/lib*a
%_libdir/lib*.so
%_libdir/pkgconfig/*
+%_libdir/qt4/lib
%plugindir/designer
/usr/include/Qt
/usr/include/Qt3Support
@@ -415,8 +422,9 @@
%if %suse_version > 910
/usr/share/pixmaps/linguist.png
%endif
-/usr/share/qt4/include
-/usr/share/qt4/%_lib
+%_libdir/qt4/include
+%_libdir/qt4/plugins
+%dir /usr/share/qt4
/usr/share/qt4/mkspecs
/usr/share/qt4/q3porting.xml
@@ -431,6 +439,14 @@
%plugindir/sqldrivers/libqsqlite*.so
%changelog
+* Fri Jul 04 2008 dmueller@suse.de
+- fix postgresql 8.3 support (bnc#403385)
+* Tue Jul 01 2008 schwab@suse.de
+- Fix memset call.
+- Fix aliasing violation.
+* Thu Jun 26 2008 dmueller@suse.de
+- add experimental patch to fix QTextStream parsing numbers
+ in system locale
* Wed Jun 18 2008 mfabian@suse.de
- bnc#398526: add qt4-input-method-lazy-load.patch
by Peng Wu .
++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.a11253/_old 2008-07-09 22:53:29.000000000 +0200
+++ /var/tmp/diff_new_pack.a11253/_new 2008-07-09 22:53:29.000000000 +0200
@@ -27,7 +27,7 @@
# COMMON-BEGIN
# COMMON-BEGIN
Version: 4.4.0
-Release: 7
+Release: 8
%define base_name libqt4
%define x11_free -x11-opensource-src-
%define rversion 4.4.0
@@ -58,7 +58,7 @@
Patch61: qt4-fake-bold.patch
Patch62: qdbus-enable-on-sles10.diff
Patch66: statusbar-recursion.diff
-Patch67: revert-psql-detection.diff
+Patch67: postgresql83-support.diff
Patch68: xim-callback-crash.diff
Patch69: 0223-fix-qpixmap-hasalpha.diff
Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch
@@ -69,6 +69,9 @@
Patch75: qt-debug-timer.diff
Patch76: qt-qfatal-abort.diff
Patch77: qt4-input-method-lazy-load.patch
+Patch78: qtextstream-locale-parsing.diff
+Patch79: aliasing.diff
+Patch80: memset.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
%define common_options -fast -no-separate-debug-info -shared -xkb -tablet -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 -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite
@@ -112,7 +115,7 @@
%endif
%patch62
%patch66
-%patch67
+%patch67 -p1
%patch68
%patch69
%patch70
@@ -123,6 +126,9 @@
%patch75
%patch76
%patch77
+%patch78
+%patch79
+%patch80
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
# COMMON-END
@@ -238,6 +244,14 @@
%plugindir/sqldrivers/libqsqlmysql*.so
%changelog
+* Fri Jul 04 2008 dmueller@suse.de
+- fix postgresql 8.3 support (bnc#403385)
+* Tue Jul 01 2008 schwab@suse.de
+- Fix memset call.
+- Fix aliasing violation.
+* Thu Jun 26 2008 dmueller@suse.de
+- add experimental patch to fix QTextStream parsing numbers
+ in system locale
* Wed Jun 18 2008 mfabian@suse.de
- bnc#398526: add qt4-input-method-lazy-load.patch
by Peng Wu .
++++++ libQtWebKit-devel.spec ++++++
--- /var/tmp/diff_new_pack.a11253/_old 2008-07-09 22:53:29.000000000 +0200
+++ /var/tmp/diff_new_pack.a11253/_new 2008-07-09 22:53:29.000000000 +0200
@@ -31,7 +31,7 @@
# COMMON-BEGIN
# COMMON-BEGIN
Version: 4.4.0
-Release: 15
+Release: 18
%define base_name libqt4
%define x11_free -x11-opensource-src-
%define rversion 4.4.0
@@ -62,7 +62,7 @@
Patch61: qt4-fake-bold.patch
Patch62: qdbus-enable-on-sles10.diff
Patch66: statusbar-recursion.diff
-Patch67: revert-psql-detection.diff
+Patch67: postgresql83-support.diff
Patch68: xim-callback-crash.diff
Patch69: 0223-fix-qpixmap-hasalpha.diff
Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch
@@ -73,6 +73,9 @@
Patch75: qt-debug-timer.diff
Patch76: qt-qfatal-abort.diff
Patch77: qt4-input-method-lazy-load.patch
+Patch78: qtextstream-locale-parsing.diff
+Patch79: aliasing.diff
+Patch80: memset.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 910
%define common_options -fast -no-separate-debug-info -shared -xkb -tablet -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 -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite
@@ -118,7 +121,7 @@
%endif
%patch62
%patch66
-%patch67
+%patch67 -p1
%patch68
%patch69
%patch70
@@ -129,6 +132,9 @@
%patch75
%patch76
%patch77
+%patch78
+%patch79
+%patch80
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff}
# COMMON-END
@@ -190,7 +196,7 @@
%build
%ifarch ppc64
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc"
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc"
%endif
export QTDIR=$PWD
export PATH=$PWD/bin:$PATH
@@ -297,6 +303,14 @@
/usr/bin/qt4-browser
%changelog
+* Fri Jul 04 2008 dmueller@suse.de
+- fix postgresql 8.3 support (bnc#403385)
+* Tue Jul 01 2008 schwab@suse.de
+- Fix memset call.
+- Fix aliasing violation.
+* Thu Jun 26 2008 dmueller@suse.de
+- add experimental patch to fix QTextStream parsing numbers
+ in system locale
* Wed Jun 18 2008 mfabian@suse.de
- bnc#398526: add qt4-input-method-lazy-load.patch
by Peng Wu .
++++++ aliasing.diff ++++++
--- src/corelib/io/qprocess_unix.cpp
+++ src/corelib/io/qprocess_unix.cpp
@@ -839,10 +839,14 @@ bool QProcessPrivate::processStarted()
qint64 QProcessPrivate::bytesAvailableFromStdout() const
{
- size_t nbytes = 0;
+#if defined (Q_OS_IRIX)
+ off_t nbytes = 0;
+#else
+ int nbytes = 0;
+#endif
qint64 available = 0;
if (::ioctl(stdoutChannel.pipe[0], FIONREAD, (char *) &nbytes) >= 0)
- available = (qint64) *((int *) &nbytes);
+ available = (qint64) nbytes;
#if defined (QPROCESS_DEBUG)
qDebug("QProcessPrivate::bytesAvailableFromStdout() == %lld", available);
#endif
--- src/network/socket/qnativesocketengine_unix.cpp
+++ src/network/socket/qnativesocketengine_unix.cpp
@@ -515,18 +515,18 @@ qint64 QNativeSocketEnginePrivate::nativ
ioctl() to be an int, which is normally 32-bit even on 64-bit
machines.
- IRIX, on the other hand, expects a size_t, which is 64-bit on
+ IRIX, on the other hand, expects a off_t, which is 64-bit on
64-bit machines.
-
- So, the solution is to use size_t initialized to zero to make
- sure all bits are set to zero, preventing underflow with the
- FreeBSD/Linux/Solaris ioctls.
*/
- size_t nbytes = 0;
+#if defined (Q_OS_IRIX)
+ off_t nbytes = 0;
+#else
+ int nbytes = 0;
+#endif
// gives shorter than true amounts on Unix domain sockets.
qint64 available = 0;
if (::ioctl(socketDescriptor, FIONREAD, (char *) &nbytes) >= 0)
- available = (qint64) *((int *) &nbytes);
+ available = (qint64) nbytes;
#if defined (QNATIVESOCKETENGINE_DEBUG)
qDebug("QNativeSocketEnginePrivate::nativeBytesAvailable() == %lli", available);
++++++ libQtWebKit-devel.spec.in ++++++
--- libqt4/libQtWebKit-devel.spec.in 2008-06-16 09:17:25.000000000 +0200
+++ libqt4/libQtWebKit-devel.spec.in 2008-07-08 00:03:48.000000000 +0200
@@ -85,7 +85,7 @@
%build
%ifarch ppc64
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc"
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc"
%endif
export QTDIR=$PWD
export PATH=$PWD/bin:$PATH
++++++ memset.diff ++++++
--- tools/qdoc3/tokenizer.cpp
+++ tools/qdoc3/tokenizer.cpp
@@ -475,7 +475,7 @@ void Tokenizer::initialize(const Config
defines = new QRegExp(d.join("|"));
falsehoods = new QRegExp(config.getStringList(CONFIG_FALSEHOODS).join("|"));
- memset(kwordHashTable, sizeof(kwordHashTable), 0);
+ memset(kwordHashTable, 0, sizeof(kwordHashTable));
for (int i = 0; i < Tok_LastKeyword - Tok_FirstKeyword + 1; i++)
insertKwordIntoHash(kwords[i], i + 1);
++++++ postgresql83-support.diff ++++++
--- qt-x11-opensource-src-4.4.0.orig/configure
+++ qt-x11-opensource-src-4.4.0/configure
@@ -4166,7 +4166,7 @@
if "$WHICH" pg_config >/dev/null 2>&1; then
QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
- QT_LIBS_PSQL=`pg_config --libs 2>/dev/null`
+ QT_LIBS_PSQL="-lpq"
fi
[ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
[ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL $QT_LIBS_PSQL"
--- qt-x11-opensource-src-4.4.0.orig/src/sql/drivers/psql/qsql_psql.cpp
+++ qt-x11-opensource-src-4.4.0/src/sql/drivers/psql/qsql_psql.cpp
@@ -641,6 +641,9 @@
case 2:
serverVersion = QPSQLDriver::Version82;
break;
+ case 3:
+ serverVersion = QPSQLDriver::Version83;
+ break;
}
break;
default:
@@ -896,7 +899,7 @@
switch(d->pro) {
case QPSQLDriver::Version6:
- stmt = QLatin1String("select pg_att1.attname, int(pg_att1.atttypid), pg_cl.relname "
+ stmt = QLatin1String("select pg_att1.attname, pg_att1.atttypid::int, pg_cl.relname "
"from pg_attribute pg_att1, pg_attribute pg_att2, pg_class pg_cl, pg_index pg_ind "
"where lower(pg_cl.relname) = '%1_pkey' "
"and pg_cl.oid = pg_ind.indexrelid "
@@ -921,6 +924,7 @@
case QPSQLDriver::Version8:
case QPSQLDriver::Version81:
case QPSQLDriver::Version82:
+ case QPSQLDriver::Version83:
stmt = QLatin1String("SELECT pg_attribute.attname, pg_attribute.atttypid::int, "
"pg_class.relname "
"FROM pg_attribute, pg_class "
@@ -960,9 +964,9 @@
QString stmt;
switch(d->pro) {
case QPSQLDriver::Version6:
- stmt = QLatin1String("select pg_attribute.attname, int(pg_attribute.atttypid), "
+ stmt = QLatin1String("select pg_attribute.attname, pg_attribute.atttypid::int, "
"pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, "
- "int(pg_attribute.attrelid), pg_attribute.attnum "
+ "pg_attribute.attrelid::int, pg_attribute.attnum "
"from pg_class, pg_attribute "
"where lower(pg_class.relname) = '%1' "
"and pg_attribute.attnum > 0 "
@@ -994,6 +998,7 @@
case QPSQLDriver::Version8:
case QPSQLDriver::Version81:
case QPSQLDriver::Version82:
+ case QPSQLDriver::Version83:
stmt = QLatin1String("select pg_attribute.attname, pg_attribute.atttypid::int, "
"pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, "
"pg_attrdef.adsrc "
--- qt-x11-opensource-src-4.4.0.orig/src/sql/drivers/psql/qsql_psql.h
+++ qt-x11-opensource-src-4.4.0/src/sql/drivers/psql/qsql_psql.h
@@ -106,7 +106,8 @@
Version74 = 10,
Version8 = 11,
Version81 = 12,
- Version82 = 13
+ Version82 = 13,
+ Version83 = 14
};
explicit QPSQLDriver(QObject *parent=0);
++++++ qtextstream-locale-parsing.diff ++++++
--- src/corelib/kernel/qcoreapplication.cpp
+++ src/corelib/kernel/qcoreapplication.cpp
@@ -439,6 +440,7 @@
#ifdef Q_OS_UNIX
setlocale(LC_ALL, ""); // use correct char set mapping
+ setlocale(LC_NUMERIC, "C"); // make sprintf()/scanf() work
#endif
#ifdef Q_WS_WIN
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org