Hello community,
here is the log from the commit of package qt
checked in at Mon Jul 31 18:28:54 CEST 2006.
--------
--- qt/qt-sql-plugins.changes 2006-07-13 13:55:04.000000000 +0200
+++ qt/qt-sql-plugins.changes 2006-07-31 16:24:58.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Jul 31 16:24:09 CEST 2006 - dmueller(a)suse.de
+
+- Update to Qt 4.2 technical preview 1
+ - QGraphicsView
+ - DBus Bindings
+
+-------------------------------------------------------------------
qt.changes: same change
Old:
----
0112-ksyntaxhighlighter-rehighlight-document.diff
0113-qaction_patch.diff
0115-qaction-altshortcuts.diff
0128-no-qhash-warnings.diff
external-sqlite.diff
preproorder.patch
qt-x11-opensource-src-4.1.4.tar.bz2
s390-build-fix.diff
warnings.patch
New:
----
qt-core-plugins.diff
qt-x11-4.2.0-snapshot-20060704.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.jXRq3H/_old 2006-07-31 18:28:37.000000000 +0200
+++ /var/tmp/diff_new_pack.jXRq3H/_new 2006-07-31 18:28:37.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package qt-sql-plugins (Version 4.1.4)
+# spec file for package qt-sql-plugins (Version 4.1.9_20060704)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -22,27 +22,20 @@
Summary: Qt 4 SQL related libraries
# COMMON-BEGIN
# COMMON-BEGIN
-Version: 4.1.4
-Release: 3
-%define x11_free -x11-opensource-src-
-%define rversion 4.1.4
+Version: 4.1.9_20060704
+Release: 1
+%define x11_free -x11-
+%define rversion 4.2.0-snapshot-20060704
Source: qt%x11_free%rversion.tar.bz2
Source10: qt4config.desktop
Source11: designer4.desktop
Source12: linguist4.desktop
Source13: assistant4.desktop
-Patch1: external-sqlite.diff
Patch2: qt-never-strip.diff
-Patch3: s390-build-fix.diff
-Patch4: warnings.patch
+Patch3: qt-core-plugins.diff
Patch5: lib64.patch
-Patch6: 0113-qaction_patch.diff
Patch9: 0130-coverity-checks.diff
-Patch10: 0115-qaction-altshortcuts.diff
-Patch12: 0128-no-qhash-warnings.diff
Patch13: fix-plugin-loading.diff
-Patch14: preproorder.patch
-Patch17: 0112-ksyntaxhighlighter-rehighlight-document.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define common_options -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -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/qt/ -examplesdir %_docdir/qt/examples -demosdir %_docdir/qt/demos -plugindir %plugindir -translationdir /usr/share/qt/translations -sysconfdir /etc/settings -datadir /usr/share/qt/
@@ -60,22 +53,15 @@
%define plugindir %_libdir/qt/plugins
%setup -q -n qt%x11_free%rversion
#%patch -p1
-%patch2
+#%patch2
%patch3
-%patch4
%patch5
-%patch6
%patch9
-%patch10
-%patch12
%patch13
-%patch14
-%patch17
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib}
# COMMON-END
# COMMON-END
-%patch1
%package -n qt-sql-sqlite
Group: Development/Libraries/C and C++
Summary: Qt 4 sqlite plugin
@@ -144,7 +130,7 @@
sed -i -e "/QMAKE_CFLAGS_RELEASE[ \t]*=/s,\$, $RPM_OPT_FLAGS," $f
done
sed -i -e "s,^CXXFLAGS[ \t]*=,& $RPM_OPT_FLAGS," qmake/Makefile.unix
-echo yes | ./configure -release %common_options \
+echo yes | ./configure -release %common_options -system-sqlite \
-plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server \
-plugin-sql-odbc \
-plugin-sql-mysql -I/usr/include/mysql/ \
@@ -206,6 +192,10 @@
%plugindir/sqldrivers/libqsqlmysql*.so
%changelog -n qt-sql-plugins
+* Mon Jul 31 2006 - dmueller(a)suse.de
+- Update to Qt 4.2 technical preview 1
+- QGraphicsView
+- DBus Bindings
* Mon Jul 10 2006 - dmueller(a)suse.de
- Remove patches that didn't go upstream
- Shorten ChangeLog
++++++ qt.spec ++++++
--- /var/tmp/diff_new_pack.jXRq3H/_old 2006-07-31 18:28:37.000000000 +0200
+++ /var/tmp/diff_new_pack.jXRq3H/_new 2006-07-31 18:28:37.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package qt (Version 4.1.4)
+# spec file for package qt (Version 4.1.9_20060704)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,7 +11,7 @@
# norootforbuild
Name: qt
-BuildRequires: Mesa-devel cups-devel freetype2-devel gcc-c++ krb5-devel libjpeg-devel libmng-devel libpng-devel pkgconfig
+BuildRequires: Mesa-devel cups-devel dbus-1-devel freetype2-devel gcc-c++ krb5-devel libjpeg-devel libmng-devel libpng-devel pkgconfig
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
@@ -21,27 +21,20 @@
Autoreqprov: on
Summary: C++ Program Library, Core Components
# COMMON-BEGIN
-Version: 4.1.4
-Release: 3
-%define x11_free -x11-opensource-src-
-%define rversion 4.1.4
+Version: 4.1.9_20060704
+Release: 1
+%define x11_free -x11-
+%define rversion 4.2.0-snapshot-20060704
Source: qt%x11_free%rversion.tar.bz2
Source10: qt4config.desktop
Source11: designer4.desktop
Source12: linguist4.desktop
Source13: assistant4.desktop
-Patch1: external-sqlite.diff
Patch2: qt-never-strip.diff
-Patch3: s390-build-fix.diff
-Patch4: warnings.patch
+Patch3: qt-core-plugins.diff
Patch5: lib64.patch
-Patch6: 0113-qaction_patch.diff
Patch9: 0130-coverity-checks.diff
-Patch10: 0115-qaction-altshortcuts.diff
-Patch12: 0128-no-qhash-warnings.diff
Patch13: fix-plugin-loading.diff
-Patch14: preproorder.patch
-Patch17: 0112-ksyntaxhighlighter-rehighlight-document.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define common_options -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -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/qt/ -examplesdir %_docdir/qt/examples -demosdir %_docdir/qt/demos -plugindir %plugindir -translationdir /usr/share/qt/translations -sysconfdir /etc/settings -datadir /usr/share/qt/
@@ -61,17 +54,11 @@
%define plugindir %_libdir/qt/plugins
%setup -q -n qt%x11_free%rversion
#%patch -p1
-%patch2
+#%patch2
%patch3
-%patch4
%patch5
-%patch6
%patch9
-%patch10
-%patch12
%patch13
-%patch14
-%patch17
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib}
# COMMON-END
@@ -94,6 +81,21 @@
--------
Troll Tech AS, Norway
+%package dbus-1
+Group: System/Libraries
+Summary: C++ Program Library, D-BUS Bindings
+
+%description dbus-1
+Qt is a set of libraries for developing applications.
+
+This package contains the D-BUS Qt bindings.
+
+
+
+Authors:
+--------
+ Troll Tech AS, Norway
+
%package devel-doc
Group: Documentation/HTML
Summary: Qt documentation
@@ -185,8 +187,10 @@
find $RPM_BUILD_ROOT/usr/share/qt/mkspecs -name 'qmake.conf' -exec chmod -x -- {} \;
find $RPM_BUILD_ROOT/usr/share/qt/mkspecs -name Info.plist.app -exec chmod -x -- {} \;
mkdir -p $RPM_BUILD_ROOT/%plugindir/sqldrivers
-cp -a changes-* \
+if test -f changes-*; then
+ cp -a changes-* \
$RPM_BUILD_ROOT/usr/share/doc/packages/%name/
+fi
#
# install menu entries
#
@@ -234,7 +238,7 @@
%dir %plugindir
%dir /usr/share/qt
%dir /usr/share/doc/packages/%name
-/usr/share/doc/packages/%name/changes-*
+#/usr/share/doc/packages/%name/changes-*
%_libdir/libQtCore*.so.*
%_libdir/libQtNetwork*.so.*
%_libdir/libQtXml*.so.*
@@ -253,6 +257,10 @@
%_libdir/libQtOpenGL*.so.*
%_libdir/libQtSvg.so.*
+%plugindir/codecs
+
+%plugindir/iconengines
+
%plugindir/imageformats
%plugindir/inputmethods
@@ -265,6 +273,10 @@
%plugindir/accessible/libqtaccessiblecompatwidgets.so
+%files dbus-1
+%defattr(-,root,root,755)
+%_libdir/libQtDBus*.so.*
+
%files devel
%defattr(-,root,root,755)
/usr/bin/rcc
@@ -276,8 +288,8 @@
/usr/bin/linguist
/usr/bin/lrelease
/usr/bin/lupdate
-/usr/bin/qm2ts
/usr/bin/qt3to4
+/usr/bin/dbusxml2cpp
%_libdir/lib*.prl
%_libdir/lib*a
%_libdir/lib*.so
@@ -303,6 +315,7 @@
#/usr/share/doc/packages/%name/demos
/usr/%_lib/%name/examples
/usr/%_lib/%name/demos
+%_libdir/libQtAssistantClient.so.*
%files sql
%defattr(-,root,root,755)
@@ -310,6 +323,10 @@
%_libdir/libQtSql*.so.*
%changelog -n qt
+* Mon Jul 31 2006 - dmueller(a)suse.de
+- Update to Qt 4.2 technical preview 1
+- QGraphicsView
+- DBus Bindings
* Mon Jul 10 2006 - dmueller(a)suse.de
- Remove patches that didn't go upstream
- Shorten ChangeLog
++++++ 0130-coverity-checks.diff ++++++
--- /var/tmp/diff_new_pack.jXRq3H/_old 2006-07-31 18:28:37.000000000 +0200
+++ /var/tmp/diff_new_pack.jXRq3H/_new 2006-07-31 18:28:37.000000000 +0200
@@ -1,69 +1,130 @@
issue : none yet
applied: no
-author: mueller
+author: mueller, mpyne
patches for Coverity reports.
-Index: src/gui/painting/qprintengine_ps.cpp
-===================================================================
---- src/gui/painting/qprintengine_ps.cpp (revision 538540)
-+++ src/gui/painting/qprintengine_ps.cpp (working copy)
-@@ -1005,8 +1005,7 @@ bool QPSPrintEngine::end()
- d->outDevice->write(trailer);
- ignoreSigPipe(false);
-
-- if (d->outDevice)
-- d->outDevice->close();
-+ d->outDevice->close();
- if (d->fd >= 0)
- ::close(d->fd);
- d->fd = -1;
Index: src/qt3support/network/q3http.cpp
===================================================================
---- src/qt3support/network/q3http.cpp (revision 539287)
+--- src/qt3support/network/q3http.cpp (revision 556971)
+++ src/qt3support/network/q3http.cpp (working copy)
-@@ -2028,6 +2028,7 @@ void Q3Http::slotReadyRead()
- if ( tmp[0] != '\r' || tmp[1] != '\n' ) {
+@@ -1982,6 +1982,7 @@
+ if ( !ok ) {
finishedWithError( QHttp::tr("Invalid HTTP chunked body"), WrongContentLength );
close();
+ delete arr;
return;
}
- }
+ if ( d->chunkedSize == 0 ) // last-chunk
Index: src/network/qhttp.cpp
===================================================================
---- src/network/qhttp.cpp (revision 539433)
+--- src/network/qhttp.cpp (revision 556971)
+++ src/network/qhttp.cpp (working copy)
-@@ -2542,6 +2542,7 @@ void QHttpPrivate::_q_slotReadyRead()
- finishedWithError(QT_TRANSLATE_NOOP("QHttp", "Invalid HTTP chunked body"),
+@@ -2553,6 +2553,7 @@
+ finishedWithError(QLatin1String(QT_TRANSLATE_NOOP("QHttp", "Invalid HTTP chunked body")),
QHttp::WrongContentLength);
closeConn();
+ delete arr;
return;
}
}
-Index: src/qt3support/network/q3dns.cpp
+Index: tools/porting/src/parser.cpp
===================================================================
---- src/qt3support/network/q3dns.cpp (revision 539433)
-+++ src/qt3support/network/q3dns.cpp (working copy)
-@@ -2545,6 +2545,8 @@ void Q3Dns::doResInit()
- // this host supports ipv6.
- if ( address->isIPv4Address() || ipv6support )
- ns->append( address );
-+ else
-+ delete address;
- } else {
- delete address;
- }
-Index: tools/designer/src/lib/shared/qdesigner_command.cpp
-===================================================================
---- tools/designer/src/lib/shared/qdesigner_command.cpp (revision 539433)
-+++ tools/designer/src/lib/shared/qdesigner_command.cpp (working copy)
-@@ -434,6 +434,7 @@
- checkObjectName(m_widget);
-
- QWidget *parentWidget = m_widget->parentWidget();
-+ Q_ASSERT(parentWidget);
-
- QDesignerFormEditorInterface *core = formWindow()->core();
- QDesignerLayoutDecorationExtension *deco = qt_extension<QDesignerLayoutDecorationExtension*>(core->extensionManager(), parentWidget);
+--- tools/porting/src/parser.cpp (revision 556971)
++++ tools/porting/src/parser.cpp (working copy)
+@@ -1358,7 +1358,7 @@
+
+ label1:
+ {
+- bool isVector = true;
++ bool isVector = false;
+
+ while (tokenStream->lookAhead() == '[') {
+ int startArray = tokenStream->cursor();
+Index: src/gui/widgets/qtoolbar.cpp
+===================================================================
+--- src/gui/widgets/qtoolbar.cpp (revision 556971)
++++ src/gui/widgets/qtoolbar.cpp (working copy)
+@@ -583,7 +583,7 @@
+ QLayoutItem *item = 0;
+ do {
+ item = layout->itemAt(i++);
+- if (item->widget() == this)
++ if (item && item->widget() == this)
+ sz = mw->iconSize();
+ } while (!sz.isValid() && item != 0);
+ }
+Index: src/xml/qdom.cpp
+===================================================================
+--- src/xml/qdom.cpp (revision 556971)
++++ src/xml/qdom.cpp (working copy)
+@@ -1883,10 +1883,10 @@
+
+ QDomNodePrivate* QDomNodePrivate::replaceChild(QDomNodePrivate* newChild, QDomNodePrivate* oldChild)
+ {
++ if (!newChild || !oldChild)
++ return 0;
+ if (oldChild->parent() != this)
+ return 0;
+- if (!newChild || !oldChild)
+- return 0;
+ if (newChild == oldChild)
+ return 0;
+
+Index: src/gui/image/qxpmhandler.cpp
+===================================================================
+--- src/gui/image/qxpmhandler.cpp (revision 556971)
++++ src/gui/image/qxpmhandler.cpp (working copy)
+@@ -1009,7 +1009,8 @@
+
+ int cpp, ncols, w, h, index = 0;
+
+- if (device) {
++ if (!source) {
++ Q_ASSERT(device);
+ // "/* XPM */"
+ int readBytes;
+ if ((readBytes = device->readLine(buf.data(), buf.size())) < 0)
+Index: demos/shared/arthurstyle.cpp
+===================================================================
+--- demos/shared/arthurstyle.cpp (revision 556971)
++++ demos/shared/arthurstyle.cpp (working copy)
+@@ -117,7 +117,7 @@
+ painter->setBrushOrigin(0,0);
+ }
+
+- bool down = pushButton && ((button->state & State_Sunken) || (button->state & State_On));
++ bool down = ((button->state & State_Sunken) || (button->state & State_On));
+
+ QPixmap left, right, mid;
+ if (down) {
+Index: src/gui/itemviews/qtreewidget.cpp
+===================================================================
+--- src/gui/itemviews/qtreewidget.cpp (revision 556971)
++++ src/gui/itemviews/qtreewidget.cpp (working copy)
+@@ -447,10 +447,10 @@
+ bool QTreeModel::setHeaderData(int section, Qt::Orientation orientation,
+ const QVariant &value, int role)
+ {
+- if (section < 0 || (orientation == Qt::Horizontal && header->columnCount() <= section))
++ if (section < 0 || !header || (orientation == Qt::Horizontal && header->columnCount() <= section))
+ return false;
+
+- if (orientation == Qt::Horizontal && header) {
++ if (orientation == Qt::Horizontal) {
+ header->setData(section, role, value);
+ return true;
+ }
+Index: src/qt3support/text/q3richtext.cpp
+===================================================================
+--- src/qt3support/text/q3richtext.cpp (revision 556971)
++++ src/qt3support/text/q3richtext.cpp (working copy)
+@@ -1904,7 +1904,7 @@
+
+ NEWPAR;
+
+- if (curtag.style->displayMode() == Q3StyleSheetItem::DisplayListItem) {
++ if (curtag.style && curtag.style->displayMode() == Q3StyleSheetItem::DisplayListItem) {
+ it = attr.find("value");
+ if (it != end)
+ curpar->setListValue((*it).toInt());
++++++ qt-core-plugins.diff ++++++
------------------------------------------------------------------------
r564226 | hausmann | 2006-07-19 18:00:16 +0200 (Wed, 19 Jul 2006) | 2 lines
- for Dirk :)
------------------------------------------------------------------------
Index: src/plugins/codecs/cn/cn.pro
===================================================================
--- src/plugins/codecs/cn/cn.pro (revision 564225)
+++ src/plugins/codecs/cn/cn.pro (revision 564226)
@@ -3,6 +3,7 @@ include(../../qpluginbase.pri)
CONFIG += warn_on
DESTDIR = $$QT_BUILD_TREE/plugins/codecs
+QT = core
HEADERS = qgb18030codec.h
Index: src/plugins/codecs/jp/jp.pro
===================================================================
--- src/plugins/codecs/jp/jp.pro (revision 564225)
+++ src/plugins/codecs/jp/jp.pro (revision 564226)
@@ -3,6 +3,7 @@ include(../../qpluginbase.pri)
CONFIG += warn_on
DESTDIR = $$QT_BUILD_TREE/plugins/codecs
+QT = core
HEADERS = qjpunicode.h \
qeucjpcodec.h \
Index: src/plugins/codecs/tw/tw.pro
===================================================================
--- src/plugins/codecs/tw/tw.pro (revision 564225)
+++ src/plugins/codecs/tw/tw.pro (revision 564226)
@@ -3,6 +3,7 @@ include(../../qpluginbase.pri)
CONFIG += warn_on
DESTDIR = $$QT_BUILD_TREE/plugins/codecs
+QT = core
HEADERS = qbig5codec.h
Index: src/plugins/codecs/kr/kr.pro
===================================================================
--- src/plugins/codecs/kr/kr.pro (revision 564225)
+++ src/plugins/codecs/kr/kr.pro (revision 564226)
@@ -3,6 +3,7 @@ include(../../qpluginbase.pri)
CONFIG += warn_on
DESTDIR = $$QT_BUILD_TREE/plugins/codecs
+QT = core
HEADERS = qeuckrcodec.h
++++++ qt-sql-plugins.spec.in ++++++
--- qt/qt-sql-plugins.spec.in 2006-06-23 10:43:19.000000000 +0200
+++ qt/qt-sql-plugins.spec.in 2006-07-31 14:04:45.000000000 +0200
@@ -22,7 +22,6 @@
Summary: Qt 4 SQL related libraries
# COMMON-BEGIN
# COMMON-END
-%patch1
%package -n qt-sql-sqlite
Group: Development/Libraries/C and C++
@@ -91,7 +90,7 @@
sed -i -e "/QMAKE_CFLAGS_RELEASE[ \t]*=/s,\$, $RPM_OPT_FLAGS," $f
done
sed -i -e "s,^CXXFLAGS[ \t]*=,& $RPM_OPT_FLAGS," qmake/Makefile.unix
-echo yes | ./configure -release %common_options \
+echo yes | ./configure -release %common_options -system-sqlite \
-plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server \
-plugin-sql-odbc \
-plugin-sql-mysql -I/usr/include/mysql/ \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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