rev 9473 - in trunk/packages/qt4-x11/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Tue Feb 26 18:29:22 UTC 2008
Author: fabo
Date: 2008-02-26 18:29:21 +0000 (Tue, 26 Feb 2008)
New Revision: 9473
Removed:
trunk/packages/qt4-x11/debian/patches/0204-fix-tulip-aliasing.diff
trunk/packages/qt4-x11/debian/patches/0206-fix-meta-modifier.diff
trunk/packages/qt4-x11/debian/patches/0207-better-xerrorhandler.diff
trunk/packages/qt4-x11/debian/patches/0208-fix-quitools-incompatibility.diff
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/copyright
trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff
trunk/packages/qt4-x11/debian/patches/0172-prefer-xrandr-over-xinerama.diff
trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff
trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff
trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff
trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff
trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff
trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff
trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff
trunk/packages/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff
trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
trunk/packages/qt4-x11/debian/patches/0200-fix-qsslsocket-waitfor.diff
trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
trunk/packages/qt4-x11/debian/patches/0205-fast-qpixmap-fill.diff
trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff
trunk/packages/qt4-x11/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff
trunk/packages/qt4-x11/debian/patches/0211-q3action-crash.diff
trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff
trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff
trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
trunk/packages/qt4-x11/debian/patches/08_load_ssl.diff
trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff
trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff
trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff
trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff
trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff
trunk/packages/qt4-x11/debian/patches/series
Log:
Prepare Qt4.3.4.
* Remove patches 0204, 0206, 0207. Merged upstream.
* Remove patch 0208. Not safe.
* Update copyright file. Add GPL version 3.
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/changelog 2008-02-26 18:29:21 UTC (rev 9473)
@@ -1,17 +1,13 @@
-qt4-x11 (4.3.3-3) UNRELEASED; urgency=low
+qt4-x11 (4.3.4-1) unstable; urgency=low
+ * New upstream release:
+ * This version adds the GNU General Public License (GPL) version 3
+ to all Qt Open Source editions. The GPL Exception version 1.1
+ applies to both versions of the GPL license.
+
* Add qt-copy patches:
* 0205-fast-qpixmap-fill
Fix a performance issue in QPixmap::fill()
- * 0206-fix-meta-modifier
- Fix handling of the Meta modifier
- * 0207-better-xerrorhandler (it isn't enabled)
- Better X error handler
- It tries harder to find error descriptions and prints qAppName()
- * 0208-fix-quitools-incompatibility
- This patch removes dependency of QUiTools library on QObjectPrivate.
- Since QUiTools is a statically linked library, anything using it could
- abort whenever the installed Qt version changes.
* 0209-prevent-qt-mixing
This patch changes QObjectPrivateVersion, thus preventing mixing parts
of upstream Qt and qt-copy.
@@ -22,14 +18,16 @@
During porting qt3to4 port QGroupAction to Q3GroupAction but not QAction
to Q3Action (which is logical) But it crashs when it's not a q3action.
* Refresh and enable 0172-prefer-xrandr-over-xinerama patch.
+ * Remove 0204-fix-tulip-aliasing patch. Merged upstream.
* Add ${shlibs:Depends} to libqt4-dev. See missing shared library
dependencies thread on debian-devel mailing list.
* Add catalan translation. Thanks to Javier Serrano Polo. (Closes: #459822)
+ * Update copyright file. Add GPL version 3.
TODO: add a piece of code to generate binary qt_ca translation file
install/clean binary qt_ca translation file
- -- Fathi Boudra <fabo at debian.org> Wed, 02 Jan 2008 09:45:31 +0100
+ -- Fathi Boudra <fabo at debian.org> Tue, 26 Feb 2008 18:38:27 +0100
qt4-x11 (4.3.3-2) unstable; urgency=low
Modified: trunk/packages/qt4-x11/debian/copyright
===================================================================
--- trunk/packages/qt4-x11/debian/copyright 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/copyright 2008-02-26 18:29:21 UTC (rev 9473)
@@ -14,8 +14,8 @@
License:
This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
+ it under the terms of the GNU General Public License version 2 or version 3
+ as published by the Free Software Foundation.
This package is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -28,8 +28,11 @@
02110-1301, USA.
On Debian systems, the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/GPL'.
+can be found in `/usr/share/common-licenses/GPL-2' and
+`/usr/share/common-licenses/GPL-3'.
+Since Qt4.3.4, Qt is triple licensed under the QPL, GPL 2 and GPL 3.
+
Since Qt4.3.1, a Trolltech GPL exception was added to allow linking
against non-GPL libraries and applications:
Modified: trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -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: trunk/packages/qt4-x11/debian/patches/0172-prefer-xrandr-over-xinerama.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0172-prefer-xrandr-over-xinerama.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/0172-prefer-xrandr-over-xinerama.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -1,4 +1,4 @@
-qt-bugs@ issue : none
+qt-bugs@ issue : N198137
Trolltech task ID : none
bugs.kde.org number :
applied: no
@@ -19,14 +19,17 @@
it also includes a fix for a bug that causes the whole KDE session to crash
when you remove a CRTc.
+
--- a/src/gui/kernel/qdesktopwidget_x11.cpp
+++ b/src/gui/kernel/qdesktopwidget_x11.cpp
-@@ -119,28 +119,32 @@
+@@ -124,30 +124,35 @@
+ void QDesktopWidgetPrivate::init()
+ {
// get the screen count
++ int newScreenCount;
#ifndef QT_NO_XINERAMA
XineramaScreenInfo *xinerama_screeninfo = 0;
-- int unused;
-+ int unused, newScreenCount;
+ int unused;
use_xinerama = (XineramaQueryExtension(X11->display, &unused, &unused) && XineramaIsActive(X11->display));
- if (use_xinerama) {
@@ -62,7 +65,7 @@
#ifndef QT_NO_XINERAMA
if (use_xinerama) {
-@@ -157,11 +161,29 @@
+@@ -164,11 +169,29 @@
h = HeightOfScreen(ScreenOfDisplay(X11->display, i));
}
@@ -93,7 +96,7 @@
if (xinerama_screeninfo)
XFree(xinerama_screeninfo);
#endif // QT_NO_XINERAMA
-@@ -209,8 +231,7 @@
+@@ -216,8 +239,7 @@
screen = d->defaultScreen;
if (! d->screens) {
Modified: trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -8,7 +8,7 @@
--- a/src/corelib/arch/qatomic_s390.h
+++ b/src/corelib/arch/qatomic_s390.h
-@@ -195,10 +195,20 @@
+@@ -202,10 +202,20 @@
#endif
}
Modified: trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -8,7 +8,7 @@
--- a/src/gui/painting/qimagescale.cpp
+++ b/src/gui/painting/qimagescale.cpp
-@@ -1024,6 +1024,7 @@
+@@ -1031,6 +1031,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 @@
+@@ -1149,15 +1149,9 @@
if (!size.isEmpty()) {
QSvgHandler::LengthType type;
qreal len = parseLength(size, type, handler);
Modified: trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -9,7 +9,7 @@
--- a/src/gui/kernel/qwidget.h
+++ b/src/gui/kernel/qwidget.h
-@@ -352,6 +352,19 @@
+@@ -359,6 +359,19 @@
void setWindowOpacity(qreal level);
qreal windowOpacity() const;
@@ -31,7 +31,7 @@
#ifndef QT_NO_TOOLTIP
--- a/src/gui/kernel/qdnd_x11.cpp
+++ b/src/gui/kernel/qdnd_x11.cpp
-@@ -268,6 +268,7 @@
+@@ -275,6 +275,7 @@
QWidget(QApplication::desktop()->screen(screen),
Qt::Tool | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint)
{
@@ -39,7 +39,7 @@
}
void setPixmap(const QPixmap &pm)
-@@ -1436,6 +1437,7 @@
+@@ -1443,6 +1444,7 @@
// recreate the pixmap on the new screen...
delete xdnd_data.deco;
xdnd_data.deco = new QShapedPixmapWidget(screen);
@@ -47,7 +47,7 @@
if (!QWidget::mouseGrabber()) {
updatePixmap();
xdnd_data.deco->grabMouse();
-@@ -1897,6 +1899,7 @@
+@@ -1904,6 +1906,7 @@
object = o;
object->d_func()->target = 0;
xdnd_data.deco = new QShapedPixmapWidget();
@@ -57,7 +57,7 @@
--- a/src/gui/kernel/qt_x11_p.h
+++ b/src/gui/kernel/qt_x11_p.h
-@@ -528,6 +528,11 @@
+@@ -535,6 +535,11 @@
_NET_WM_WINDOW_TYPE_SPLASH,
_NET_WM_WINDOW_TYPE_TOOLBAR,
_NET_WM_WINDOW_TYPE_UTILITY,
@@ -71,7 +71,7 @@
--- a/src/gui/kernel/qtooltip.cpp
+++ b/src/gui/kernel/qtooltip.cpp
-@@ -147,6 +147,9 @@
+@@ -154,6 +154,9 @@
setMouseTracking(true);
fadingOut = false;
reuseTip(text);
@@ -81,7 +81,7 @@
}
void QTipLabel::restartHideTimer()
-@@ -367,6 +370,10 @@
+@@ -374,6 +377,10 @@
// that is showing (removes flickering)
if (QTipLabel::instance->tipChanged(pos, text, w)){
QTipLabel::instance->reuseTip(text);
@@ -92,7 +92,7 @@
QTipLabel::instance->setTipRect(w, rect);
QTipLabel::instance->placeTip(pos, w);
}
-@@ -376,6 +383,10 @@
+@@ -383,6 +390,10 @@
if (!text.isEmpty()){ // no tip can be reused, create new tip:
new QTipLabel(pos, text, w); // sets QTipLabel::instance to itself
@@ -105,7 +105,7 @@
QTipLabel::instance->setObjectName(QLatin1String("qtooltip_label"));
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
-@@ -212,6 +212,11 @@
+@@ -219,6 +219,11 @@
"_NET_WM_WINDOW_TYPE_SPLASH\0"
"_NET_WM_WINDOW_TYPE_TOOLBAR\0"
"_NET_WM_WINDOW_TYPE_UTILITY\0"
@@ -119,7 +119,7 @@
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -560,10 +560,6 @@
+@@ -567,10 +567,6 @@
}
#endif // QT_NO_XRENDER
@@ -130,7 +130,7 @@
QtMWMHints mwmhints;
mwmhints.flags = 0L;
mwmhints.functions = MWM_FUNC_ALL;
-@@ -574,15 +570,11 @@
+@@ -581,15 +577,11 @@
if (topLevel) {
ulong wsa_mask = 0;
if (type == Qt::SplashScreen) {
@@ -147,7 +147,7 @@
mwmhints.decorations |= MWM_DECOR_BORDER;
mwmhints.decorations |= MWM_DECOR_RESIZEH;
-@@ -604,22 +596,6 @@
+@@ -611,22 +603,6 @@
wsa.save_under = True;
wsa_mask |= CWSaveUnder;
}
@@ -170,7 +170,7 @@
if (flags & Qt::X11BypassWindowManagerHint) {
wsa.override_redirect = True;
-@@ -638,6 +614,7 @@
+@@ -645,6 +621,7 @@
wsa.save_under = True;
XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
&wsa);
@@ -178,7 +178,7 @@
} else if (topLevel && !desktop) { // top-level widget
if (!X11->wm_client_leader)
create_wm_client_leader();
-@@ -682,12 +659,7 @@
+@@ -689,12 +666,7 @@
// set mwm hints
SetMWMHints(dpy, id, mwmhints);
@@ -192,7 +192,7 @@
// set _NET_WM_PID
long curr_pid = getpid();
-@@ -783,6 +755,63 @@
+@@ -790,6 +762,63 @@
q->setAttribute(Qt::WA_OutsideWSRange, true);
}
@@ -258,7 +258,7 @@
destroyWindow is true.
--- a/src/gui/widgets/qcombobox.cpp
+++ b/src/gui/widgets/qcombobox.cpp
-@@ -332,6 +332,10 @@
+@@ -339,6 +339,10 @@
combo->update();
}
}
@@ -271,7 +271,7 @@
void QComboBoxPrivateContainer::resizeEvent(QResizeEvent *e)
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
-@@ -97,6 +97,9 @@
+@@ -104,6 +104,9 @@
QTornOffMenu(QMenu *p) : QMenu(*(new QTornOffMenuPrivate(p)))
{
setParent(p, Qt::Window | Qt::Tool);
@@ -281,7 +281,7 @@
setAttribute(Qt::WA_DeleteOnClose, true);
setWindowTitle(p->windowTitle());
setEnabled(p->isEnabled());
-@@ -143,6 +146,9 @@
+@@ -150,6 +153,9 @@
}
defaultMenuAction = menuAction = new QAction(q);
menuAction->d_func()->menu = q;
@@ -291,7 +291,7 @@
}
//Windows and KDE allows menus to cover the taskbar, while GNOME and Mac don't
-@@ -1678,6 +1684,33 @@
+@@ -1685,6 +1691,33 @@
}
}
setGeometry(QRect(pos, size));
@@ -325,7 +325,7 @@
#ifndef QT_NO_EFFECTS
int hGuess = qApp->layoutDirection() == Qt::RightToLeft ? QEffects::LeftScroll : QEffects::RightScroll;
int vGuess = QEffects::DownScroll;
-@@ -1874,6 +1907,9 @@
+@@ -1881,6 +1914,9 @@
if (QMenuBar *mb = qobject_cast<QMenuBar*>(d->causedPopup.widget))
mb->d_func()->setCurrentAction(0);
#endif
Modified: trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -10,7 +10,7 @@
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -1648,7 +1648,7 @@
+@@ -1655,7 +1655,7 @@
do_size_hints(q, extra);
// udpate WM_TRANSIENT_FOR
Modified: trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0180-window-role.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/0180-window-role.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -38,7 +38,7 @@
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
-@@ -1006,9 +1006,18 @@
+@@ -1013,9 +1013,18 @@
{
Q_D(QObject);
d->objectName = name;
@@ -59,7 +59,7 @@
QObject::child is compat but needs to call itself recursively,
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
-@@ -137,6 +137,9 @@
+@@ -144,6 +144,9 @@
mutable quint32 connectedSignals;
QString objectName;
@@ -71,7 +71,7 @@
class QSemaphore;
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
-@@ -307,6 +307,7 @@
+@@ -314,6 +314,7 @@
#if defined(Q_WS_X11)
void setWindowRole(const char *role);
@@ -81,7 +81,7 @@
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -669,11 +669,8 @@
+@@ -676,11 +676,8 @@
// when we create a toplevel widget, the frame strut should be dirty
data.fstrut_dirty = 1;
@@ -95,7 +95,7 @@
// set client leader property
XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
-@@ -2669,12 +2666,20 @@
+@@ -2676,12 +2673,20 @@
void QWidgetPrivate::setWindowRole(const char *role)
{
Q_Q(QWidget);
Modified: trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -17,7 +17,7 @@
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
-@@ -2091,7 +2091,6 @@
+@@ -2098,7 +2098,6 @@
{
QFontEngine *engine = d->engineForScript(QUnicodeTables::Common);
Q_ASSERT(engine != 0);
@@ -25,7 +25,7 @@
if (!engine->fontDef.fixedPitchComputed) {
QChar ch[2] = { QLatin1Char('i'), QLatin1Char('m') };
QGlyphLayout g[2];
-@@ -2100,7 +2099,6 @@
+@@ -2107,7 +2106,6 @@
engine->fontDef.fixedPitch = g[0].advance.x == g[1].advance.x;
engine->fontDef.fixedPitchComputed = true;
}
@@ -35,7 +35,7 @@
--- a/src/gui/text/qfont_p.h
+++ b/src/gui/text/qfont_p.h
-@@ -64,9 +64,7 @@
+@@ -71,9 +71,7 @@
styleStrategy(QFont::PreferDefault), styleHint(QFont::AnyStyle),
weight(50), fixedPitch(false), style(QFont::StyleNormal), stretch(100),
ignorePitch(true)
@@ -45,7 +45,7 @@
{
}
-@@ -88,7 +86,7 @@
+@@ -95,7 +93,7 @@
uint stretch : 12; // 0-400
uint ignorePitch : 1;
Modified: trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -11,7 +11,7 @@
--- a/src/gui/itemviews/qlistview.cpp
+++ b/src/gui/itemviews/qlistview.cpp
-@@ -1071,7 +1071,7 @@
+@@ -1078,7 +1078,7 @@
option.state &= ~QStyle::State_Enabled;
cg = QPalette::Disabled;
} else {
Modified: trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -9,7 +9,7 @@
--- a/src/gui/itemviews/qitemdelegate.cpp
+++ b/src/gui/itemviews/qitemdelegate.cpp
-@@ -633,10 +633,10 @@
+@@ -640,10 +640,10 @@
QPen pen = painter->pen();
QPalette::ColorGroup cg = option.state & QStyle::State_Enabled
Modified: trunk/packages/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -7,7 +7,7 @@
--- a/src/gui/itemviews/qlistview.cpp
+++ b/src/gui/itemviews/qlistview.cpp
-@@ -992,7 +992,7 @@
+@@ -999,7 +999,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 @@
+@@ -2973,7 +2973,7 @@
#ifndef QT_NO_DRAGANDDROP
/*!
@@ -27,7 +27,7 @@
*/
void QAbstractItemView::startDrag(Qt::DropActions supportedActions)
{
-@@ -2983,7 +2983,7 @@
+@@ -2990,7 +2990,7 @@
drag->setPixmap(pixmap);
drag->setMimeData(data);
drag->setHotSpot(d->pressedPosition - rect.topLeft());
Modified: trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -9,7 +9,7 @@
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -614,7 +614,11 @@
+@@ -621,7 +621,11 @@
wsa.save_under = True;
XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
&wsa);
@@ -22,7 +22,7 @@
} else if (topLevel && !desktop) { // top-level widget
if (!X11->wm_client_leader)
create_wm_client_leader();
-@@ -659,29 +663,34 @@
+@@ -666,29 +670,34 @@
// set mwm hints
SetMWMHints(dpy, id, mwmhints);
Modified: trunk/packages/qt4-x11/debian/patches/0200-fix-qsslsocket-waitfor.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0200-fix-qsslsocket-waitfor.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/0200-fix-qsslsocket-waitfor.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -11,7 +11,7 @@
--- a/src/network/qsslsocket.cpp
+++ b/src/network/qsslsocket.cpp
-@@ -250,6 +250,19 @@
+@@ -257,6 +257,19 @@
#include <QtNetwork/qhostaddress.h>
#include <QtNetwork/qhostinfo.h>
@@ -31,7 +31,7 @@
class QSslSocketGlobalData
{
public:
-@@ -1109,7 +1122,7 @@
+@@ -1116,7 +1129,7 @@
startClientEncryption();
// Loop, waiting until the connection has been encrypted or an error
// occurs.
@@ -40,7 +40,7 @@
return false;
}
return d->connectionEncrypted;
-@@ -1137,7 +1150,7 @@
+@@ -1144,7 +1157,7 @@
return false;
}
@@ -49,7 +49,7 @@
if (d->readBuffer.size() != oldReadBufferSize) {
// If the read buffer has grown, readyRead() must have been emitted.
return true;
-@@ -1166,7 +1179,7 @@
+@@ -1173,7 +1186,7 @@
return false;
}
Modified: trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -7,7 +7,7 @@
--- a/src/gui/text/qtexthtmlparser.cpp
+++ b/src/gui/text/qtexthtmlparser.cpp
-@@ -1031,7 +1031,7 @@
+@@ -1038,7 +1038,7 @@
&& !attributes.at(i + 1).isEmpty()) {
hasHref = true;
charFormat.setUnderlineStyle(QTextCharFormat::SingleUnderline);
Deleted: trunk/packages/qt4-x11/debian/patches/0204-fix-tulip-aliasing.diff
Modified: trunk/packages/qt4-x11/debian/patches/0205-fast-qpixmap-fill.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0205-fast-qpixmap-fill.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/0205-fast-qpixmap-fill.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -16,7 +16,7 @@
--- a/src/gui/image/qpixmap_x11.cpp
+++ b/src/gui/image/qpixmap_x11.cpp
-@@ -440,8 +440,28 @@
+@@ -447,8 +447,28 @@
return;
if (fillColor.alpha() != 255) {
#ifndef QT_NO_XRENDER
Deleted: trunk/packages/qt4-x11/debian/patches/0206-fix-meta-modifier.diff
Deleted: trunk/packages/qt4-x11/debian/patches/0207-better-xerrorhandler.diff
Deleted: trunk/packages/qt4-x11/debian/patches/0208-fix-quitools-incompatibility.diff
Modified: trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -15,7 +15,7 @@
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
-@@ -75,7 +75,9 @@
+@@ -82,7 +82,9 @@
inline QObjectData::~QObjectData() {}
Modified: trunk/packages/qt4-x11/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/0210-fix-crash-q3stylesheet-font-size.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -1,5 +1,5 @@
-qt-bugs@ issue : none
-Trolltech task ID : none
+qt-bugs@ issue : 197621
+Trolltech task ID : 197836
bugs.kde.org number : none
applied: yes
author: Montel Laurent <montel at kde.org>
@@ -10,7 +10,7 @@
--- a/src/qt3support/text/q3stylesheet.cpp
+++ b/src/qt3support/text/q3stylesheet.cpp
-@@ -1454,9 +1454,9 @@
+@@ -1461,9 +1461,9 @@
s = baseSize;
}
if (pixel)
Modified: trunk/packages/qt4-x11/debian/patches/0211-q3action-crash.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0211-q3action-crash.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/0211-q3action-crash.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -11,7 +11,7 @@
--- a/src/qt3support/widgets/q3action.cpp
+++ b/src/qt3support/widgets/q3action.cpp
-@@ -1664,7 +1664,7 @@
+@@ -1671,7 +1671,7 @@
if (d->dropdown) {
if (!d->exclusive) {
QList<Q3Action*>::Iterator it(d->actions.begin());
Modified: trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -2,7 +2,7 @@
--- a/tools/assistant/lib/qassistantclient.cpp
+++ b/tools/assistant/lib/qassistantclient.cpp
-@@ -185,11 +185,11 @@
+@@ -192,11 +192,11 @@
: QObject( parent ), host ( QLatin1String("localhost") )
{
if ( path.isEmpty() )
Modified: trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -4,7 +4,7 @@
--- a/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
+++ b/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
-@@ -389,7 +389,7 @@
+@@ -396,7 +396,7 @@
else {
// run moc on this file
QProcess proc;
Modified: trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -2,7 +2,7 @@
--- a/tools/designer/src/lib/shared/qdesigner_utils.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp
-@@ -131,7 +131,7 @@
+@@ -138,7 +138,7 @@
binary += QDir::separator();
switch (mode) {
case UIC_GenerateCode:
Modified: trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -57,7 +57,7 @@
if [ "$VERBOSE" = "yes" ]; then
--- a/configure
+++ b/configure
-@@ -3517,7 +3517,7 @@
+@@ -3523,7 +3523,7 @@
}
# build qmake
@@ -66,7 +66,7 @@
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
-@@ -5438,8 +5438,8 @@
+@@ -5444,8 +5444,8 @@
QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc
#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -77,7 +77,7 @@
QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3
QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -5703,11 +5703,11 @@
+@@ -5709,11 +5709,11 @@
#-------------------------------------------------------------------------------
echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@
fi
# .projects -> projects to process
-@@ -5880,7 +5880,7 @@
+@@ -5886,7 +5886,7 @@
echo " for $a\c"
fi
Modified: trunk/packages/qt4-x11/debian/patches/08_load_ssl.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/08_load_ssl.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/08_load_ssl.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -1,6 +1,6 @@
--- a/src/network/qsslsocket_openssl_symbols.cpp
+++ b/src/network/qsslsocket_openssl_symbols.cpp
-@@ -247,7 +247,7 @@
+@@ -254,7 +254,7 @@
return false;
}
#else
@@ -9,7 +9,7 @@
if (!libssl.load()) {
// Cannot find libssl
qWarning("QSslSocket: cannot find ssl library: %s.",
-@@ -255,7 +255,7 @@
+@@ -262,7 +262,7 @@
return false;
}
Modified: trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -4,7 +4,7 @@
--- a/tools/qtestlib/src/qtestcase.h
+++ b/tools/qtestlib/src/qtestcase.h
-@@ -208,7 +208,7 @@
+@@ -215,7 +215,7 @@
template <typename T1, typename T2>
bool qCompare(T1 const &, T2 const &, const char *, const char *, const char *, int);
Modified: trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -4,7 +4,7 @@
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
-@@ -329,7 +329,7 @@
+@@ -336,7 +336,7 @@
# if defined(Q_OS_DARWIN) && __GNUC__ == 3 && (__GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 3)
# define Q_BROKEN_DEBUG_STREAM
# endif
Modified: trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -1,6 +1,6 @@
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -67,14 +67,7 @@
+@@ -74,14 +74,7 @@
{
public:
static QSettings *findConfiguration();
@@ -16,7 +16,7 @@
static QSettings *configuration()
{
#ifdef QT_NO_THREAD
-@@ -93,6 +86,15 @@
+@@ -100,6 +93,15 @@
}
};
@@ -34,7 +34,7 @@
settings = QLibraryInfoPrivate::findConfiguration();
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
-@@ -479,7 +479,7 @@
+@@ -486,7 +486,7 @@
}
template <class Key, class T>
Modified: trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -4,7 +4,7 @@
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
-@@ -123,6 +123,12 @@
+@@ -130,6 +130,12 @@
# define Q_OS_RELIANT
#elif defined(__linux__) || defined(__linux)
# define Q_OS_LINUX
@@ -17,7 +17,7 @@
#elif defined(__FreeBSD__) || defined(__DragonFly__)
# define Q_OS_FREEBSD
# define Q_OS_BSD4
-@@ -143,8 +149,6 @@
+@@ -150,8 +156,6 @@
# define Q_OS_AIX
#elif defined(__Lynx__)
# define Q_OS_LYNX
@@ -28,7 +28,7 @@
#elif defined(__QNXNTO__)
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
-@@ -291,11 +291,11 @@
+@@ -298,11 +298,11 @@
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
@@ -44,7 +44,7 @@
const char *pattern, ulong p_len)
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
-@@ -61,7 +61,7 @@
+@@ -68,7 +68,7 @@
#include <qdebug.h>
#include <time.h>
@@ -53,7 +53,7 @@
# include <fenv.h>
#endif
-@@ -5927,7 +5927,7 @@
+@@ -5934,7 +5934,7 @@
_control87(MCW_EM, MCW_EM);
#endif
@@ -62,7 +62,7 @@
fenv_t envp;
feholdexcept(&envp);
#endif
-@@ -5943,7 +5943,7 @@
+@@ -5950,7 +5950,7 @@
#endif //_M_X64
#endif //Q_OS_WIN
Modified: trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -5,7 +5,7 @@
--- a/src/corelib/io/qfilesystemwatcher_inotify.cpp
+++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp
-@@ -101,6 +101,10 @@
+@@ -108,6 +108,10 @@
# define __NR_inotify_init 269
# define __NR_inotify_add_watch 270
# define __NR_inotify_rm_watch 271
Modified: trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff 2008-02-26 18:29:21 UTC (rev 9473)
@@ -2,7 +2,7 @@
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
-@@ -53,6 +53,10 @@
+@@ -60,6 +60,10 @@
# include <private/qcore_mac_p.h>
#endif
Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series 2008-02-26 15:51:35 UTC (rev 9472)
+++ trunk/packages/qt4-x11/debian/patches/series 2008-02-26 18:29:21 UTC (rev 9473)
@@ -13,11 +13,7 @@
0195-compositing-properties.diff
0200-fix-qsslsocket-waitfor.diff
0203-qtexthtmlparser-link-color.diff
-0204-fix-tulip-aliasing.diff
0205-fast-qpixmap-fill.diff
-0206-fix-meta-modifier.diff
-#0207-better-xerrorhandler.diff
-0208-fix-quitools-incompatibility.diff
0209-prevent-qt-mixing.diff
0210-fix-crash-q3stylesheet-font-size.diff
0211-q3action-crash.diff
More information about the pkg-kde-commits
mailing list