rev 8555 - in branches/qt4-x11/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Wed Dec 26 21:46:31 UTC 2007
Author: fabo
Date: 2007-12-26 21:46:31 +0000 (Wed, 26 Dec 2007)
New Revision: 8555
Removed:
branches/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff
branches/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff
branches/qt4-x11/debian/patches/0200-fix-qsslsocket-waitfor.diff
branches/qt4-x11/debian/patches/0204-fix-tulip-aliasing.diff
Modified:
branches/qt4-x11/debian/changelog
branches/qt4-x11/debian/patches/0167-fix-group-reading.diff
branches/qt4-x11/debian/patches/0176-coverity-fixes.diff
branches/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff
branches/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
branches/qt4-x11/debian/patches/0300-pedantic-fixes.diff
branches/qt4-x11/debian/patches/series
Log:
* Refresh qt-copy patches: 0167, 0176, 0179, 0194, 0203, and 0300.
* Disable qt-copy patches: 0175, O178, 0180, 0187 and 0195.
* Remove qt-copy patches: 0191, 0192, 0200 and 0204.
Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog 2007-12-26 20:37:00 UTC (rev 8554)
+++ branches/qt4-x11/debian/changelog 2007-12-26 21:46:31 UTC (rev 8555)
@@ -23,14 +23,16 @@
* Enable Phonon, WebKit and XmlPatterns.
* Enable exceptions. It is a dependency to XmlPatterns module.
* Refresh Debian patches.
- * Disable qt-copy patches.
+ * Refresh qt-copy patches: 0167, 0176, 0179, 0194, 0203, and 0300.
+ * Disable qt-copy patches: 0175, O178, 0180, 0187 and 0195.
+ * Remove qt-copy patches: 0191, 0192, 0200 and 0204.
* Add patch to fix phonon_gstreamer plugin install.
* Remove patches:
* 21_assume_no_fpu_for_embedded_devices. Merged upstream.
It breaks ABI on mips.
* 30_arm_ftbfs_fixes. Merged upstream.
* Update .install files: libqt4-core, libqt4-gui and qt4-dev-tools.
- * Add packages: libqt4-dbus, libqt4-phonon , libqt4-webkit and
+ * Add packages: libqt4-dbus, libqt4-phonon, libqt4-webkit and
libqt4-xmlpatterns.
* Move QtDBus module from libqt4-core in libqt4-dbus package.
Modified: branches/qt4-x11/debian/patches/0167-fix-group-reading.diff
===================================================================
--- branches/qt4-x11/debian/patches/0167-fix-group-reading.diff 2007-12-26 20:37:00 UTC (rev 8554)
+++ branches/qt4-x11/debian/patches/0167-fix-group-reading.diff 2007-12-26 21:46:31 UTC (rev 8555)
@@ -9,7 +9,7 @@
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
-@@ -843,9 +843,16 @@
+@@ -850,9 +850,16 @@
} else if (own == OwnerGroup) {
struct group *gr = 0;
#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
Modified: branches/qt4-x11/debian/patches/0176-coverity-fixes.diff
===================================================================
--- branches/qt4-x11/debian/patches/0176-coverity-fixes.diff 2007-12-26 20:37:00 UTC (rev 8554)
+++ branches/qt4-x11/debian/patches/0176-coverity-fixes.diff 2007-12-26 21:46:31 UTC (rev 8555)
@@ -8,7 +8,7 @@
--- a/src/gui/painting/qimagescale.cpp
+++ b/src/gui/painting/qimagescale.cpp
-@@ -1024,6 +1024,7 @@
+@@ -1027,6 +1027,7 @@
buffer = QImage(dw, dh, src.format());
if (buffer.isNull()) {
qWarning("QImage: out of memory, returning null");
@@ -18,7 +18,7 @@
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
-@@ -1142,15 +1142,9 @@
+@@ -1095,15 +1095,9 @@
if (!size.isEmpty()) {
QSvgHandler::LengthType type;
qreal len = parseLength(size, type, handler);
Deleted: branches/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff
Deleted: branches/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff
Modified: branches/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff
===================================================================
--- branches/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff 2007-12-26 20:37:00 UTC (rev 8554)
+++ branches/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff 2007-12-26 21:46:31 UTC (rev 8555)
@@ -7,7 +7,7 @@
--- a/src/gui/itemviews/qlistview.cpp
+++ b/src/gui/itemviews/qlistview.cpp
-@@ -992,7 +992,7 @@
+@@ -998,7 +998,7 @@
}
QDrag *drag = new QDrag(this);
drag->setMimeData(d->model->mimeData(indexes));
@@ -18,7 +18,7 @@
d->clearOrRemove();
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
-@@ -2966,7 +2966,7 @@
+@@ -3020,7 +3020,7 @@
#ifndef QT_NO_DRAGANDDROP
/*!
@@ -27,7 +27,7 @@
*/
void QAbstractItemView::startDrag(Qt::DropActions supportedActions)
{
-@@ -2983,7 +2983,7 @@
+@@ -3037,7 +3037,7 @@
drag->setPixmap(pixmap);
drag->setMimeData(data);
drag->setHotSpot(d->pressedPosition - rect.topLeft());
Deleted: branches/qt4-x11/debian/patches/0200-fix-qsslsocket-waitfor.diff
Modified: branches/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
===================================================================
--- branches/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff 2007-12-26 20:37:00 UTC (rev 8554)
+++ branches/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff 2007-12-26 21:46:31 UTC (rev 8555)
@@ -7,7 +7,7 @@
--- a/src/gui/text/qtexthtmlparser.cpp
+++ b/src/gui/text/qtexthtmlparser.cpp
-@@ -1031,7 +1031,7 @@
+@@ -1044,7 +1044,7 @@
&& !attributes.at(i + 1).isEmpty()) {
hasHref = true;
charFormat.setUnderlineStyle(QTextCharFormat::SingleUnderline);
Deleted: branches/qt4-x11/debian/patches/0204-fix-tulip-aliasing.diff
Modified: branches/qt4-x11/debian/patches/0300-pedantic-fixes.diff
===================================================================
--- branches/qt4-x11/debian/patches/0300-pedantic-fixes.diff 2007-12-26 20:37:00 UTC (rev 8554)
+++ branches/qt4-x11/debian/patches/0300-pedantic-fixes.diff 2007-12-26 21:46:31 UTC (rev 8555)
@@ -2,9 +2,9 @@
Fix compilation with CXXFLAGS=-pedantic -Wno-long-long.
---- a/src/network/qnetworkproxy.cpp
-+++ b/src/network/qnetworkproxy.cpp
-@@ -207,7 +207,7 @@
+--- a/src/network/kernel/qnetworkproxy.cpp
++++ b/src/network/kernel/qnetworkproxy.cpp
+@@ -224,7 +224,7 @@
#endif
};
@@ -13,9 +13,9 @@
class QNetworkProxyPrivate
{
---- a/src/network/qsocks5socketengine.cpp
-+++ b/src/network/qsocks5socketengine.cpp
-@@ -345,7 +345,7 @@
+--- a/src/network/socket/qsocks5socketengine.cpp
++++ b/src/network/socket/qsocks5socketengine.cpp
+@@ -351,7 +351,7 @@
QHash<int, QSocks5BindData *> store;
};
@@ -24,19 +24,8 @@
QSocks5BindStore::QSocks5BindStore()
: mutex(QMutex::Recursive)
---- a/src/xml/qdom.cpp
-+++ b/src/xml/qdom.cpp
-@@ -676,7 +676,7 @@
-
- *ok = true;
- return result;
--};
-+}
-
- // [15] Comment ::= '<!--' ((Char - '-') | ('-' (Char - '-')))* '-->'
- // can't escape "--", since entities are not recognised within comments
---- a/src/xml/qxmlstream_p.h
-+++ b/src/xml/qxmlstream_p.h
+--- a/src/corelib/xml/qxmlstream_p.h
++++ b/src/corelib/xml/qxmlstream_p.h
@@ -116,7 +116,7 @@
GOTO_INDEX_OFFSET = 418,
Modified: branches/qt4-x11/debian/patches/series
===================================================================
--- branches/qt4-x11/debian/patches/series 2007-12-26 20:37:00 UTC (rev 8554)
+++ branches/qt4-x11/debian/patches/series 2007-12-26 21:46:31 UTC (rev 8555)
@@ -1,20 +1,16 @@
# qt-copy patches
-# 0167-fix-group-reading.diff
+0167-fix-group-reading.diff
# #0172-prefer-xrandr-over-xinerama.diff
# 0175-fix-s390-qatomic.diff
-# 0176-coverity-fixes.diff
+0176-coverity-fixes.diff
# 0178-transparency-window-types.diff
-# 0179-transient-hack.diff
+0179-transient-hack.diff
# 0180-window-role.diff
# 0187-fix-font-fixed-pitch.diff
-# 0191-listview-alternate-row-colors.diff
-# 0192-itemdelegate-palette-state.diff
-# 0194-fix-moveonly-dnd-in-itemviews.diff
+0194-fix-moveonly-dnd-in-itemviews.diff
# 0195-compositing-properties.diff
-# 0200-fix-qsslsocket-waitfor.diff
-# 0203-qtexthtmlparser-link-color.diff
-# 0204-fix-tulip-aliasing.diff
-# 0300-pedantic-fixes.diff
+0203-qtexthtmlparser-link-color.diff
+0300-pedantic-fixes.diff
# debian patches
01_qmake_for_debian.diff
More information about the pkg-kde-commits
mailing list