rev 9956 - in branches/qt4-x11/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Thu Apr 3 18:14:52 UTC 2008
Author: modax-guest
Date: 2008-04-03 18:14:52 +0000 (Thu, 03 Apr 2008)
New Revision: 9956
Added:
branches/qt4-x11/debian/patches/0220-no-x-recursion-in-xerrhandler.diff
Removed:
branches/qt4-x11/debian/patches/0172-prefer-xrandr-over-xinerama.diff
branches/qt4-x11/debian/patches/0178-transparency-window-types.diff
branches/qt4-x11/debian/patches/0215-compile-with-Xcursor-linkage.diff
branches/qt4-x11/debian/patches/0217-qurl-isempty-regression.diff
branches/qt4-x11/debian/patches/0218-qassert-macro-fix.diff
branches/qt4-x11/debian/patches/08_load_ssl.diff
branches/qt4-x11/debian/patches/fix-qt_bootstrapped-typo.diff
Modified:
branches/qt4-x11/debian/changelog
branches/qt4-x11/debian/patches/0167-fix-group-reading.diff
branches/qt4-x11/debian/patches/0180-window-role.diff
branches/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff
branches/qt4-x11/debian/patches/0195-compositing-properties.diff
branches/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
branches/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff
branches/qt4-x11/debian/patches/0214-fix-qgraphicsproxywidget-tab-crash.diff
branches/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff
branches/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
branches/qt4-x11/debian/patches/05_append_qt4_target.diff
branches/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
branches/qt4-x11/debian/patches/80_hurd_max_path.diff
branches/qt4-x11/debian/patches/series
Log:
Resync patches for Qt 4.4 RC1
Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog 2008-04-03 17:56:38 UTC (rev 9955)
+++ branches/qt4-x11/debian/changelog 2008-04-03 18:14:52 UTC (rev 9956)
@@ -1,3 +1,36 @@
+qt4-x11 (4.4.0~rc1-1~pre1) experimental; urgency=low
+
+ * New upstream release.
+
+ +++ Changes by Modestas Vainius:
+
+ * Refresh qt-copy patches:
+ * 0167-fix-group-reading.diff - adjust offsets.
+ * 0180-window-role.diff - adjust offsets.
+ * 0195-compositing-properties.diff - adjust offsets.
+ * 0203-qtexthtmlparser-link-color.diff - use -p0, adjust offsets.
+ * 0209-prevent-qt-mixing.diff - use -p0, adjust offsets.
+ * 0214-fix-qgraphicsproxywidget-tab-crash.diff - adjust offsets.
+ * 0216-allow-isystem-for-headers.diff - adjust offsets.
+ * Remove qt-copy patches:
+ * 0172-prefer-xrandr-over-xinerama.diff - merged upstream.
+ * 0178-transparency-window-types.diff - merged upstream.
+ * 0215-compile-with-Xcursor-linkage.diff - merged upstream.
+ * 0217-qurl-isempty-regression.diff - merged upstream.
+ * 0218-qassert-macro-fix.diff - merged upstream.
+ * fix-qt_bootstrapped-typo.diff - merged upstream.
+ * Add qt-copy patches:
+ * 0220-no-x-recursion-in-xerrhandler.diff - use -p0, adjust offsets.
+ * Refresh Debian patches:
+ * 02_launch_assistant-qt4.diff - adjust offsets.
+ * 05_append_qt4_target.diff - adopt to upstream changes.
+ * 50_kfreebsd_build_fix.diff - adjust offsets.
+ * 80_hurd_max_path.diff - adjust offsets.
+ * Remove Debian patches:
+ * 08_load_ssl.diff - different fix applied upstream.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 03 Apr 2008 21:10:42 +0300
+
qt4-x11 (4.4.0~beta1-1) experimental; urgency=low
* New upstream release.
Modified: branches/qt4-x11/debian/patches/0167-fix-group-reading.diff
===================================================================
--- branches/qt4-x11/debian/patches/0167-fix-group-reading.diff 2008-04-03 17:56:38 UTC (rev 9955)
+++ branches/qt4-x11/debian/patches/0167-fix-group-reading.diff 2008-04-03 18:14:52 UTC (rev 9956)
@@ -9,7 +9,7 @@
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
-@@ -857,9 +857,16 @@
+@@ -829,9 +829,16 @@
} else if (own == OwnerGroup) {
struct group *gr = 0;
#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
Deleted: branches/qt4-x11/debian/patches/0172-prefer-xrandr-over-xinerama.diff
Deleted: branches/qt4-x11/debian/patches/0178-transparency-window-types.diff
Modified: branches/qt4-x11/debian/patches/0180-window-role.diff
===================================================================
--- branches/qt4-x11/debian/patches/0180-window-role.diff 2008-04-03 17:56:38 UTC (rev 9955)
+++ branches/qt4-x11/debian/patches/0180-window-role.diff 2008-04-03 18:14:52 UTC (rev 9956)
@@ -47,7 +47,7 @@
struct Connection
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
-@@ -325,6 +325,7 @@
+@@ -328,6 +328,7 @@
#if defined(Q_WS_X11)
void setWindowRole();
@@ -57,7 +57,7 @@
#endif
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -697,13 +697,17 @@
+@@ -714,13 +714,17 @@
data.fstrut_dirty = 1;
// declare the widget's window role
@@ -81,7 +81,7 @@
}
// set client leader property
-@@ -2843,6 +2847,17 @@
+@@ -2857,6 +2861,17 @@
(unsigned char *)windowRole.constData(), windowRole.length());
}
Modified: branches/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff
===================================================================
--- branches/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff 2008-04-03 17:56:38 UTC (rev 9955)
+++ branches/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff 2008-04-03 18:14:52 UTC (rev 9956)
@@ -11,7 +11,7 @@
--- a/src/gui/itemviews/qlistview.cpp
+++ b/src/gui/itemviews/qlistview.cpp
-@@ -1096,7 +1096,7 @@
+@@ -1097,7 +1097,7 @@
option.state &= ~QStyle::State_Enabled;
cg = QPalette::Disabled;
} else {
Modified: branches/qt4-x11/debian/patches/0195-compositing-properties.diff
===================================================================
--- branches/qt4-x11/debian/patches/0195-compositing-properties.diff 2008-04-03 17:56:38 UTC (rev 9955)
+++ branches/qt4-x11/debian/patches/0195-compositing-properties.diff 2008-04-03 18:14:52 UTC (rev 9956)
@@ -9,7 +9,7 @@
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -640,6 +640,11 @@
+@@ -657,6 +657,11 @@
Q_ASSERT(id);
XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
&wsa);
@@ -21,7 +21,7 @@
} else if (topLevel && !desktop) { // top-level widget
if (!X11->wm_client_leader)
create_wm_client_leader();
-@@ -688,13 +693,21 @@
+@@ -705,13 +710,21 @@
// set EWMH window types
setNetWmWindowTypes();
@@ -45,7 +45,7 @@
// declare the widget's window role
QByteArray windowRole;
-@@ -714,10 +727,6 @@
+@@ -731,10 +744,6 @@
XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
XA_WINDOW, 32, PropModeReplace,
(unsigned char *)&X11->wm_client_leader, 1);
Modified: branches/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
===================================================================
--- branches/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff 2008-04-03 17:56:38 UTC (rev 9955)
+++ branches/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff 2008-04-03 18:14:52 UTC (rev 9956)
@@ -1,13 +1,13 @@
qt-bugs@ issue : N190509
Trolltech task ID : 190904
-applied: yes
+applied: no
author: Rafael Fernández López <ereslibre at kde.org>
Links are assigned a foreground color according to the system current color scheme.
---- a/src/gui/text/qtexthtmlparser.cpp
-+++ b/src/gui/text/qtexthtmlparser.cpp
-@@ -1053,7 +1053,7 @@
+--- src/gui/text/qtexthtmlparser.cpp (revisión: 745183)
++++ src/gui/text/qtexthtmlparser.cpp (copia de trabajo)
+@@ -1053,7 +1053,7 @@ void QTextHtmlParserNode::initializeProp
&& !attributes.at(i + 1).isEmpty()) {
hasHref = true;
charFormat.setUnderlineStyle(QTextCharFormat::SingleUnderline);
Modified: branches/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff
===================================================================
--- branches/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff 2008-04-03 17:56:38 UTC (rev 9955)
+++ branches/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff 2008-04-03 18:14:52 UTC (rev 9956)
@@ -1,7 +1,7 @@
qt-bugs@ issue : none
Trolltech task ID : none
bugs.kde.org number : none
-applied: no
+applied: yes
author: Lubos Lunak <l.lunak at kde.org>
This patch changes QObjectPrivateVersion, thus preventing mixing
@@ -13,9 +13,9 @@
This patch does not make qt-copy binary incompatible with upstream Qt.
It only further enforces using the same sources for the whole Qt build.
---- a/src/corelib/kernel/qobject_p.h
-+++ b/src/corelib/kernel/qobject_p.h
-@@ -85,7 +85,9 @@
+--- src/corelib/kernel/qobject_p.h.sav 2008-01-29 19:37:26.000000000 +0100
++++ src/corelib/kernel/qobject_p.h 2008-01-30 14:08:15.000000000 +0100
+@@ -85,7 +85,9 @@ extern QSignalSpyCallbackSet Q_CORE_EXPO
inline QObjectData::~QObjectData() {}
Modified: branches/qt4-x11/debian/patches/0214-fix-qgraphicsproxywidget-tab-crash.diff
===================================================================
--- branches/qt4-x11/debian/patches/0214-fix-qgraphicsproxywidget-tab-crash.diff 2008-04-03 17:56:38 UTC (rev 9955)
+++ branches/qt4-x11/debian/patches/0214-fix-qgraphicsproxywidget-tab-crash.diff 2008-04-03 18:14:52 UTC (rev 9956)
@@ -10,7 +10,7 @@
--- a/src/gui/graphicsview/qgraphicsproxywidget.cpp
+++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp
-@@ -328,6 +328,10 @@
+@@ -376,6 +376,10 @@
}
}
Deleted: branches/qt4-x11/debian/patches/0215-compile-with-Xcursor-linkage.diff
Modified: branches/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff
===================================================================
--- branches/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff 2008-04-03 17:56:38 UTC (rev 9955)
+++ branches/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff 2008-04-03 18:14:52 UTC (rev 9956)
@@ -24,7 +24,7 @@
--- a/configure
+++ b/configure
-@@ -811,6 +811,11 @@
+@@ -829,6 +829,11 @@
VAL=`echo $1 | sed 's,-D,,'`
fi
;;
@@ -36,7 +36,7 @@
-I?*|-I)
VAR="add_ipath"
if [ "$1" = "-I" ]; then
-@@ -1666,6 +1671,9 @@
+@@ -1724,6 +1729,9 @@
add_ipath)
I_FLAGS="$I_FLAGS -I\"${VAL}\""
;;
Deleted: branches/qt4-x11/debian/patches/0217-qurl-isempty-regression.diff
Deleted: branches/qt4-x11/debian/patches/0218-qassert-macro-fix.diff
Added: branches/qt4-x11/debian/patches/0220-no-x-recursion-in-xerrhandler.diff
===================================================================
--- branches/qt4-x11/debian/patches/0220-no-x-recursion-in-xerrhandler.diff (rev 0)
+++ branches/qt4-x11/debian/patches/0220-no-x-recursion-in-xerrhandler.diff 2008-04-03 18:14:52 UTC (rev 9956)
@@ -0,0 +1,47 @@
+qt-bugs@ issue : 205699
+Trolltech task ID : none yet
+bugs.kde.org number : none
+applied: no
+author: Lubos Lunak <l.lunak at kde.org>
+os: unix
+
+X error handler is not allowed to do X protocol requests. Therefore e.g. creating
+QDragManager instance should not be allowed in it, as it results in things like
+creating X pixmaps. See https://bugzilla.novell.com/show_bug.cgi?id=368456.
+
+--- src/gui/kernel/qdnd_x11.cpp.sav 2008-03-01 02:33:57.000000000 +0100
++++ src/gui/kernel/qdnd_x11.cpp 2008-04-03 14:33:02.000000000 +0200
+@@ -1700,21 +1700,23 @@ void QDragManager::drop()
+
+ bool QX11Data::xdndHandleBadwindow()
+ {
+- QDragManager *manager = QDragManager::self();
+- if (manager->object && qt_xdnd_current_target) {
+- qt_xdnd_current_target = 0;
+- qt_xdnd_current_proxy_target = 0;
+- manager->object->deleteLater();
+- manager->object = 0;
+- delete xdnd_data.deco;
+- xdnd_data.deco = 0;
+- return true;
++ if (qt_xdnd_current_target) { // avoid possibly on-demand creating the manager in X error handler
++ QDragManager *manager = QDragManager::self();
++ if (manager->object) {
++ qt_xdnd_current_target = 0;
++ qt_xdnd_current_proxy_target = 0;
++ manager->object->deleteLater();
++ manager->object = 0;
++ xdnd_data.deco->deleteLater();
++ xdnd_data.deco = 0;
++ return true;
++ }
+ }
+ if (qt_xdnd_dragsource_xid) {
+ qt_xdnd_dragsource_xid = 0;
+ if (qt_xdnd_current_widget) {
+ QDragLeaveEvent e;
+- QApplication::sendEvent(qt_xdnd_current_widget, &e);
++ QApplication::postEvent(qt_xdnd_current_widget, &e);
+ qt_xdnd_current_widget = 0;
+ }
+ return true;
Modified: branches/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
===================================================================
--- branches/qt4-x11/debian/patches/02_launch_assistant-qt4.diff 2008-04-03 17:56:38 UTC (rev 9955)
+++ branches/qt4-x11/debian/patches/02_launch_assistant-qt4.diff 2008-04-03 18:14:52 UTC (rev 9956)
@@ -1,6 +1,6 @@
--- a/demos/qtdemo/menumanager.cpp
+++ b/demos/qtdemo/menumanager.cpp
-@@ -264,7 +264,7 @@
+@@ -291,7 +291,7 @@
if (this->assistantProcess.state() != QProcess::Running){
QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
#if !defined(Q_OS_MAC)
Modified: branches/qt4-x11/debian/patches/05_append_qt4_target.diff
===================================================================
--- branches/qt4-x11/debian/patches/05_append_qt4_target.diff 2008-04-03 17:56:38 UTC (rev 9955)
+++ branches/qt4-x11/debian/patches/05_append_qt4_target.diff 2008-04-03 18:14:52 UTC (rev 9956)
@@ -57,7 +57,7 @@
if [ "$VERBOSE" = "yes" ]; then
--- a/configure
+++ b/configure
-@@ -3664,7 +3664,7 @@
+@@ -3799,7 +3799,7 @@
}
# build qmake
@@ -66,7 +66,7 @@
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
-@@ -5773,8 +5773,8 @@
+@@ -5999,8 +5999,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
-@@ -6066,11 +6066,11 @@
+@@ -6300,11 +6300,11 @@
#-------------------------------------------------------------------------------
echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@
fi
# .projects -> projects to process
-@@ -6243,7 +6243,7 @@
+@@ -6477,7 +6477,7 @@
echo " for $a\c"
fi
@@ -102,7 +102,7 @@
if echo '\c' | grep '\c' >/dev/null; then
--- a/projects.pro
+++ b/projects.pro
-@@ -141,7 +141,7 @@
+@@ -114,7 +114,7 @@
win32 {
qmake.files=$$QT_BUILD_TREE/bin/qmake.exe
} else {
@@ -135,28 +135,6 @@
depend:
makedepend -D__MAKEDEPEND__ $(CPPFLAGS) $(DEPEND_SRC)
---- a/src/tools/lrelease/lrelease.pro
-+++ b/src/tools/lrelease/lrelease.pro
-@@ -26,7 +26,7 @@
- SOURCES += $$PROPARSERPATH/proitems.cpp \
- $$PROPARSERPATH/proreader.cpp
-
--TARGET = lrelease
-+TARGET = lrelease-qt4
- INCLUDEPATH += $$QT_SOURCE_TREE/tools/linguist/shared
- DESTDIR = $$QT_BUILD_TREE/bin
-
---- a/src/tools/lupdate/lupdate.pro
-+++ b/src/tools/lupdate/lupdate.pro
-@@ -41,7 +41,7 @@
- $$PROPARSERPATH/proreader.cpp
-
-
--TARGET = lupdate
-+TARGET = lupdate-qt4
- INCLUDEPATH += $$QT_SOURCE_TREE/tools/linguist/shared
- DESTDIR = $$QT_BUILD_TREE/bin
-
--- a/src/tools/moc/moc.pro
+++ b/src/tools/moc/moc.pro
@@ -1,5 +1,5 @@
@@ -212,7 +190,7 @@
static:CONFIG -= global_init_link_order
--- a/tools/qtconfig/qtconfig.pro
+++ b/tools/qtconfig/qtconfig.pro
-@@ -16,7 +16,7 @@
+@@ -19,7 +19,7 @@
RESOURCES = qtconfig.qrc
PROJECTNAME = Qt Configuration
Deleted: branches/qt4-x11/debian/patches/08_load_ssl.diff
Modified: branches/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
===================================================================
--- branches/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff 2008-04-03 17:56:38 UTC (rev 9955)
+++ branches/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff 2008-04-03 18:14:52 UTC (rev 9956)
@@ -4,7 +4,7 @@
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
-@@ -208,6 +208,12 @@
+@@ -210,6 +210,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
-@@ -228,8 +234,6 @@
+@@ -230,8 +236,6 @@
# define Q_OS_AIX
#elif defined(__Lynx__)
# define Q_OS_LYNX
@@ -55,7 +55,7 @@
# include <fenv.h>
#endif
-@@ -6254,7 +6254,7 @@
+@@ -6256,7 +6256,7 @@
_control87(MCW_EM, MCW_EM);
#endif
@@ -64,7 +64,7 @@
fenv_t envp;
feholdexcept(&envp);
#endif
-@@ -6270,7 +6270,7 @@
+@@ -6272,7 +6272,7 @@
#endif //_M_X64
#endif //Q_OS_WIN
Modified: branches/qt4-x11/debian/patches/80_hurd_max_path.diff
===================================================================
--- branches/qt4-x11/debian/patches/80_hurd_max_path.diff 2008-04-03 17:56:38 UTC (rev 9955)
+++ branches/qt4-x11/debian/patches/80_hurd_max_path.diff 2008-04-03 18:14:52 UTC (rev 9956)
@@ -2,7 +2,7 @@
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
-@@ -63,6 +63,10 @@
+@@ -66,6 +66,10 @@
QT_BEGIN_NAMESPACE
Deleted: branches/qt4-x11/debian/patches/fix-qt_bootstrapped-typo.diff
Modified: branches/qt4-x11/debian/patches/series
===================================================================
--- branches/qt4-x11/debian/patches/series 2008-04-03 17:56:38 UTC (rev 9955)
+++ branches/qt4-x11/debian/patches/series 2008-04-03 18:14:52 UTC (rev 9956)
@@ -1,20 +1,15 @@
# qt-copy patches
0167-fix-group-reading.diff
-0172-prefer-xrandr-over-xinerama.diff
-0178-transparency-window-types.diff
0180-window-role.diff
0191-listview-alternate-row-colors.diff
0192-itemdelegate-palette-state.diff
0195-compositing-properties.diff
-0203-qtexthtmlparser-link-color.diff
-0209-prevent-qt-mixing.diff
+0203-qtexthtmlparser-link-color.diff -p0
+0209-prevent-qt-mixing.diff -p0
0210-fix-crash-q3stylesheet-font-size.diff
0214-fix-qgraphicsproxywidget-tab-crash.diff
-0215-compile-with-Xcursor-linkage.diff
0216-allow-isystem-for-headers.diff
-fix-qt_bootstrapped-typo.diff
-0217-qurl-isempty-regression.diff
-0218-qassert-macro-fix.diff
+0220-no-x-recursion-in-xerrhandler.diff -p0
# debian patches
01_qmake_for_debian.diff
@@ -23,7 +18,6 @@
04_launch_uic-qt4.diff
05_append_qt4_target.diff
07_trust_dpkg-arch_over_uname-m.diff
-08_load_ssl.diff
09_qmake_lflags_as-needed.diff
10_config_tests_fixes.diff
20_mips_atomic_ops.diff
More information about the pkg-kde-commits
mailing list