rev 13309 - in branches/qt4-x11/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Sun Jan 11 20:21:34 UTC 2009
Author: fabo
Date: 2009-01-11 20:21:33 +0000 (Sun, 11 Jan 2009)
New Revision: 13309
Added:
branches/qt4-x11/debian/libqt4-scripttools.install
branches/qt4-x11/debian/patches/0263-fix-fontconfig-handling.diff
branches/qt4-x11/debian/patches/0264-fix-zero-height-qpixmap-isnull.diff
Modified:
branches/qt4-x11/debian/changelog
branches/qt4-x11/debian/control
branches/qt4-x11/debian/libqt4-dbg.install
branches/qt4-x11/debian/libqt4-dev.install
branches/qt4-x11/debian/libqt4-help.install
branches/qt4-x11/debian/libqt4-webkit-dbg.install
branches/qt4-x11/debian/libqtcore4.install
branches/qt4-x11/debian/not-installed
branches/qt4-x11/debian/patches/0167-fix-group-reading.diff
branches/qt4-x11/debian/patches/0180-window-role.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/0216-allow-isystem-for-headers.diff
branches/qt4-x11/debian/patches/0224-fast-qpixmap-fill.diff
branches/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
branches/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff
branches/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff
branches/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff
branches/qt4-x11/debian/patches/0257-qurl-validate-speedup.diff
branches/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
branches/qt4-x11/debian/patches/03_launch_moc-qt4.diff
branches/qt4-x11/debian/patches/04_launch_uic-qt4.diff
branches/qt4-x11/debian/patches/05_append_qt4_target.diff
branches/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff
branches/qt4-x11/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff
branches/qt4-x11/debian/patches/15_fix_qmake_makefile_generation.diff
branches/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff
branches/qt4-x11/debian/patches/40_alpha_ice.diff
branches/qt4-x11/debian/patches/41_disable_opengl_visibility.diff
branches/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
branches/qt4-x11/debian/patches/71_hppa_unaligned_access_fix_458133.diff
branches/qt4-x11/debian/patches/80_hurd_max_path.diff
branches/qt4-x11/debian/patches/series
branches/qt4-x11/debian/qt4-dev-tools.install
branches/qt4-x11/debian/qt4-doc-html.install
branches/qt4-x11/debian/qt4-doc.install
branches/qt4-x11/debian/qt4-qtconfig.install
branches/qt4-x11/debian/rules
Log:
Note: snapshots don't contain documentations.
So most of the packages that contain documentations are empty.
* Add libgtk2.0-dev build dependency to enable GTK theme support.
* Add package libqt4-scripttools: The QtScriptTools module provides
additional components for applications that use Qt Script.
* Add/Remove/Refresh/Update patches to build current snapshot.
This is the 1st pass review only. The 2nd pass will clean up things.
Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/changelog 2009-01-11 20:21:33 UTC (rev 13309)
@@ -1,7 +1,26 @@
qt4-x11 (4.5.0~beta1+snapshot20090110-1) UNRELEASED; urgency=low
+ Note: snapshots don't contain documentations.
+
* New upstream release.
+ * Add libgtk2.0-dev build dependency to enable GTK theme support.
+ * Add package libqt4-scripttools: The QtScriptTools module provides
+ additional components for applications that use Qt Script.
+ * Add/Remove/Refresh/Update patches.
+ +++ TODO:
+
+ * Split mkspecs in their own package to be able to use qt4-qmake standalone.
+ * Add symbols files support.
+ * Enable Qt Eclipse Integration for C++. See debian/rules.
+ * The prl postprocessing might not be needed any more.
+ Maybe also the pkg-config generation patch to qmake.
+ * Merge Ubuntu changes ? (IMHO, no)
+ - Fix binary-post-install/libqt4-dev:: to install qt.tags to libqt4-dev
+ - Add missing depends to libqt4-dev based on Qt build dependencies
+ * what to do with phonon and webkit ?
+ - webkit links against phonon.
+
-- Fathi Boudra <fabo at debian.org> Sat, 10 Jan 2009 19:54:09 +0100
qt4-x11 (4.4.3-2) unstable; urgency=low
Modified: branches/qt4-x11/debian/control
===================================================================
--- branches/qt4-x11/debian/control 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/control 2009-01-11 20:21:33 UTC (rev 13309)
@@ -7,12 +7,12 @@
firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 amd64 sparc powerpc],
libaudio-dev, libcups2-dev, libdbus-1-dev, libfreetype6-dev,
libgl1-mesa-dev | libgl-dev, libglib2.0-dev, libglu1-mesa-dev | libglu-dev,
- libice-dev, libiodbc2-dev, libjpeg62-dev, libmng-dev, libmysqlclient15-dev,
- libpam0g-dev, libpng12-dev, libpq-dev, libreadline5-dev, libsm-dev,
- libsqlite0-dev, libsqlite3-dev, libtiff4-dev, libx11-dev, libxcursor-dev,
- libxext-dev, libxft-dev, libxi-dev, libxinerama-dev, libxmu-dev,
- libxrandr-dev, libxrender-dev, libxslt1-dev, libxt-dev, x11proto-core-dev,
- zlib1g-dev
+ libgtk2.0-dev, libice-dev, libiodbc2-dev, libjpeg62-dev, libmng-dev,
+ libmysqlclient15-dev, libpam0g-dev, libpng12-dev, libpq-dev, libreadline5-dev,
+ libsm-dev, libsqlite0-dev, libsqlite3-dev, libtiff4-dev, libx11-dev,
+ libxcursor-dev, libxext-dev, libxft-dev, libxi-dev, libxinerama-dev,
+ libxmu-dev, libxrandr-dev, libxrender-dev, libxslt1-dev, libxt-dev,
+ x11proto-core-dev, zlib1g-dev
Standards-Version: 3.8.0
Homepage: http://www.trolltech.com
Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/qt4-x11
@@ -109,6 +109,20 @@
.
The QtScript module provides classes for making Qt applications scriptable.
+Package: libqt4-scripttools
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt 4 script tools module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The QtScriptTools module provides additional components for applications that
+ use Qt Script.
+ .
+ This package contains the Qt Script debugger, a tool for debugging script
+ execution in Qt applications that use Qt Script.
+
Package: libqt4-sql
Architecture: any
Section: libs
@@ -328,6 +342,7 @@
libqtgui4 (= ${binary:Version}), libqt4-svg (= ${binary:Version}),
libqt4-webkit (= ${binary:Version}), libqt4-xml (= ${binary:Version}),
libqt4-sql (= ${binary:Version}), libqt4-script (= ${binary:Version}),
+ libqt4-scripttools (= ${binary:Version}),
libqt4-xmlpatterns (= ${binary:Version}), libqt4-qt3support (= ${binary:Version}),
libqt4-designer (= ${binary:Version}), libqt4-help (= ${binary:Version}),
libqt4-assistant (= ${binary:Version}), libqt4-test (= ${binary:Version}),
Modified: branches/qt4-x11/debian/libqt4-dbg.install
===================================================================
--- branches/qt4-x11/debian/libqt4-dbg.install 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/libqt4-dbg.install 2009-01-11 20:21:33 UTC (rev 13309)
@@ -1,4 +1,7 @@
-usr/lib/libQt3Support.so.*.debug
+# Disable for unofficial release like snapshots
+# Note: libQt3Support.so.*.debug are missing.
+# It's probably a bug. Reported upstream.
+#usr/lib/libQt3Support.so.*.debug
usr/lib/libQtAssistantClient.so.*.debug
usr/lib/libQtCLucene.so.*.debug
usr/lib/libQtCore.so.*.debug
@@ -10,6 +13,7 @@
usr/lib/libQtNetwork.so.*.debug
usr/lib/libQtOpenGL.so.*.debug
usr/lib/libQtScript.so.*.debug
+usr/lib/libQtScriptTools.so.*.debug
usr/lib/libQtSql.so.*.debug
usr/lib/libQtSvg.so.*.debug
usr/lib/libQtTest.so.*.debug
Modified: branches/qt4-x11/debian/libqt4-dev.install
===================================================================
--- branches/qt4-x11/debian/libqt4-dev.install 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/libqt4-dev.install 2009-01-11 20:21:33 UTC (rev 13309)
@@ -14,6 +14,7 @@
usr/include/qt4/Qt/QtHelp
usr/include/qt4/Qt/QtNetwork
usr/include/qt4/Qt/QtScript
+usr/include/qt4/Qt/QtScriptTools
usr/include/qt4/Qt/QtSql
usr/include/qt4/Qt/QtSvg
usr/include/qt4/Qt/QtTest
@@ -2050,6 +2051,9 @@
usr/include/qt4/QtScript/qscriptstring.h
usr/include/qt4/QtScript/qscriptvalue.h
usr/include/qt4/QtScript/qscriptvalueiterator.h
+usr/include/qt4/QtScriptTools/QScriptEngineDebugger
+usr/include/qt4/QtScriptTools/QtScriptTools
+usr/include/qt4/QtScriptTools/qscriptenginedebugger.h
usr/include/qt4/QtSql/QIBaseDriver
usr/include/qt4/QtSql/QIBaseResult
usr/include/qt4/QtSql/QMYSQLDriver
@@ -2255,6 +2259,8 @@
usr/lib/libQtNetwork.so
usr/lib/libQtScript.prl
usr/lib/libQtScript.so
+usr/lib/libQtScriptTools.prl
+usr/lib/libQtScriptTools.so
usr/lib/libQtSql.prl
usr/lib/libQtSql.so
usr/lib/libQtSvg.prl
@@ -2280,6 +2286,7 @@
usr/lib/pkgconfig/QtHelp.pc
usr/lib/pkgconfig/QtNetwork.pc
usr/lib/pkgconfig/QtScript.pc
+usr/lib/pkgconfig/QtScriptTools.pc
usr/lib/pkgconfig/QtSql.pc
usr/lib/pkgconfig/QtSvg.pc
usr/lib/pkgconfig/QtTest.pc
Modified: branches/qt4-x11/debian/libqt4-help.install
===================================================================
--- branches/qt4-x11/debian/libqt4-help.install 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/libqt4-help.install 2009-01-11 20:21:33 UTC (rev 13309)
@@ -1,6 +1,7 @@
usr/lib/libQtHelp.so.*
usr/share/qt4/translations/qt_help_de.qm
usr/share/qt4/translations/qt_help_pl.qm
-usr/share/qt4/translations/qt_help_zh_CN.qm
-usr/share/qt4/translations/qt_help_zh_TW.qm
+# Disable for unofficial release like snapshots
+#usr/share/qt4/translations/qt_help_zh_CN.qm
+#usr/share/qt4/translations/qt_help_zh_TW.qm
Added: branches/qt4-x11/debian/libqt4-scripttools.install
===================================================================
--- branches/qt4-x11/debian/libqt4-scripttools.install (rev 0)
+++ branches/qt4-x11/debian/libqt4-scripttools.install 2009-01-11 20:21:33 UTC (rev 13309)
@@ -0,0 +1 @@
+usr/lib/libQtScriptTools.so.*
Modified: branches/qt4-x11/debian/libqt4-webkit-dbg.install
===================================================================
--- branches/qt4-x11/debian/libqt4-webkit-dbg.install 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/libqt4-webkit-dbg.install 2009-01-11 20:21:33 UTC (rev 13309)
@@ -1,3 +1,4 @@
-usr/lib/libQtWebKit.so.*.debug
+# Disable for unofficial release like snapshots
+#usr/lib/libQtWebKit.so.*.debug
usr/lib/qt4/plugins/designer/libqwebview.so.debug
Modified: branches/qt4-x11/debian/libqtcore4.install
===================================================================
--- branches/qt4-x11/debian/libqtcore4.install 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/libqtcore4.install 2009-01-11 20:21:33 UTC (rev 13309)
@@ -16,5 +16,3 @@
usr/share/qt4/translations/qt_uk.qm
usr/share/qt4/translations/qt_zh_CN.qm
usr/share/qt4/translations/qt_zh_TW.qm
-
-
Modified: branches/qt4-x11/debian/not-installed
===================================================================
--- branches/qt4-x11/debian/not-installed 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/not-installed 2009-01-11 20:21:33 UTC (rev 13309)
@@ -12,6 +12,7 @@
usr/lib/libQtTest.la
usr/lib/libQtCLucene.la
usr/lib/libQtScript.la
+usr/lib/libQtScriptTools.la
usr/lib/libQtXmlPatterns.la
usr/lib/libQtHelp.la
usr/lib/libQtCore.la
Modified: branches/qt4-x11/debian/patches/0167-fix-group-reading.diff
===================================================================
--- branches/qt4-x11/debian/patches/0167-fix-group-reading.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/0167-fix-group-reading.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -9,7 +9,7 @@
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
-@@ -857,9 +857,13 @@
+@@ -851,9 +851,13 @@ QString QFSFileEngine::owner(FileOwner o
size_max = sysconf(_SC_GETGR_R_SIZE_MAX);
if (size_max == -1)
size_max = 1024;
Modified: branches/qt4-x11/debian/patches/0180-window-role.diff
===================================================================
--- branches/qt4-x11/debian/patches/0180-window-role.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/0180-window-role.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -14,7 +14,7 @@
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
-@@ -1037,9 +1037,18 @@
+@@ -989,9 +989,18 @@ void QObject::setObjectName(const QStrin
{
Q_D(QObject);
d->objectName = name;
@@ -35,7 +35,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
-@@ -146,6 +146,9 @@
+@@ -139,6 +139,9 @@ public:
mutable quint32 connectedSignals;
QString objectName;
@@ -47,17 +47,17 @@
struct Connection
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
-@@ -333,6 +333,7 @@
+@@ -353,6 +353,7 @@ public:
#if defined(Q_WS_X11)
void setWindowRole();
+ virtual void checkWindowRole();
void sendStartupMessage(const char *message) const;
void setNetWmWindowTypes();
- #endif
+ void x11UpdateIsOpaque();
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -719,13 +719,17 @@
+@@ -750,13 +750,17 @@ void QWidgetPrivate::create_sys(WId wind
data.fstrut_dirty = 1;
// declare the widget's window role
@@ -81,7 +81,7 @@
}
// set client leader property
-@@ -2719,6 +2723,17 @@
+@@ -2785,6 +2789,17 @@ void QWidgetPrivate::setWindowRole()
(unsigned char *)windowRole.constData(), windowRole.length());
}
Modified: branches/qt4-x11/debian/patches/0195-compositing-properties.diff
===================================================================
--- branches/qt4-x11/debian/patches/0195-compositing-properties.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/0195-compositing-properties.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -9,7 +9,7 @@
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -662,6 +662,11 @@
+@@ -691,6 +691,11 @@ void QWidgetPrivate::create_sys(WId wind
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();
-@@ -710,13 +715,21 @@
+@@ -741,13 +746,21 @@ void QWidgetPrivate::create_sys(WId wind
// set EWMH window types
setNetWmWindowTypes();
@@ -45,7 +45,7 @@
// declare the widget's window role
QByteArray windowRole;
-@@ -736,10 +749,6 @@
+@@ -767,10 +780,6 @@ void QWidgetPrivate::create_sys(WId wind
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 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -7,7 +7,7 @@
--- a/src/gui/text/qtexthtmlparser.cpp
+++ b/src/gui/text/qtexthtmlparser.cpp
-@@ -1056,7 +1056,7 @@
+@@ -1050,7 +1050,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 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -15,7 +15,7 @@
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
-@@ -85,7 +85,9 @@
+@@ -78,7 +78,9 @@ extern QSignalSpyCallbackSet Q_CORE_EXPO
inline QObjectData::~QObjectData() {}
Modified: branches/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff
===================================================================
--- branches/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -24,7 +24,7 @@
--- a/configure
+++ b/configure
-@@ -833,6 +833,11 @@
+@@ -848,6 +848,11 @@ while [ "$#" -gt 0 ]; do
VAL=`echo $1 | sed 's,-D,,'`
fi
;;
@@ -36,7 +36,7 @@
-I?*|-I)
VAR="add_ipath"
if [ "$1" = "-I" ]; then
-@@ -1740,6 +1745,9 @@
+@@ -1807,6 +1812,9 @@ while [ "$#" -gt 0 ]; do
add_ipath)
I_FLAGS="$I_FLAGS -I\"${VAL}\""
;;
Modified: branches/qt4-x11/debian/patches/0224-fast-qpixmap-fill.diff
===================================================================
--- branches/qt4-x11/debian/patches/0224-fast-qpixmap-fill.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/0224-fast-qpixmap-fill.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -16,7 +16,7 @@
--- a/src/gui/image/qpixmap_x11.cpp
+++ b/src/gui/image/qpixmap_x11.cpp
-@@ -1121,7 +1121,26 @@
+@@ -1115,7 +1115,26 @@ void QX11PixmapData::fill(const QColor &
{
if (fillColor.alpha() != 255) {
#ifndef QT_NO_XRENDER
Modified: branches/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
===================================================================
--- branches/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch 2009-01-11 20:21:33 UTC (rev 13309)
@@ -21,7 +21,7 @@
--- a/src/gui/widgets/qtabbar.cpp
+++ b/src/gui/widgets/qtabbar.cpp
-@@ -533,8 +533,8 @@
+@@ -664,8 +664,8 @@ void QTabBarPrivate::refresh()
layoutTabs();
makeVisible(currentIndex);
q->update();
Modified: branches/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff
===================================================================
--- branches/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -18,7 +18,7 @@
--- a/src/gui/itemviews/qtreeview.h
+++ b/src/gui/itemviews/qtreeview.h
-@@ -229,6 +229,7 @@
+@@ -223,6 +223,7 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_columnsAboutToBeRemoved(const QModelIndex &, int, int))
Q_PRIVATE_SLOT(d_func(), void _q_columnsRemoved(const QModelIndex &, int, int))
Q_PRIVATE_SLOT(d_func(), void _q_modelAboutToBeReset())
@@ -28,7 +28,7 @@
#endif // QT_NO_TREEVIEW
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
-@@ -248,6 +248,19 @@
+@@ -242,6 +242,19 @@ void QTreeView::setModel(QAbstractItemMo
connect(d->model, SIGNAL(modelAboutToBeReset()), SLOT(_q_modelAboutToBeReset()));
@@ -48,7 +48,7 @@
if (d->sortingEnabled)
sortByColumn(header()->sortIndicatorSection());
}
-@@ -2815,6 +2828,8 @@
+@@ -2809,6 +2822,8 @@ void QTreeViewPrivate::expand(int item,
}
if (model->canFetchMore(index))
model->fetchMore(index);
@@ -57,7 +57,7 @@
}
void QTreeViewPrivate::collapse(int item, bool emitSignal)
-@@ -2854,6 +2869,8 @@
+@@ -2848,6 +2863,8 @@ void QTreeViewPrivate::collapse(int item
else
emit q->collapsed(modelIndex);
}
@@ -66,7 +66,7 @@
}
void QTreeViewPrivate::prepareAnimatedOperation(int item, AnimatedOperation::Type type)
-@@ -2965,6 +2982,25 @@
+@@ -2959,6 +2976,25 @@ void QTreeViewPrivate::_q_modelAboutToBe
viewItems.clear();
}
@@ -94,7 +94,7 @@
Q_UNUSED(parent);
--- a/src/gui/itemviews/qtreeview_p.h
+++ b/src/gui/itemviews/qtreeview_p.h
-@@ -101,6 +101,7 @@
+@@ -95,6 +95,7 @@ public:
QPixmap after;
};
Modified: branches/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff
===================================================================
--- branches/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -9,7 +9,7 @@
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
-@@ -1248,6 +1248,10 @@
+@@ -1252,6 +1252,10 @@ bool QMYSQLDriver::open(const QString& d
d->preparedQuerysEnabled = false;
#endif
@@ -20,7 +20,7 @@
setOpen(true);
setOpenError(false);
return true;
-@@ -1256,6 +1260,9 @@
+@@ -1260,6 +1264,9 @@ bool QMYSQLDriver::open(const QString& d
void QMYSQLDriver::close()
{
if (isOpen()) {
@@ -28,5 +28,5 @@
+ mysql_thread_end();
+#endif
mysql_close(d->mysql);
+ d->mysql = NULL;
setOpen(false);
- setOpenError(false);
Modified: branches/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff
===================================================================
--- branches/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -9,7 +9,7 @@
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
-@@ -2994,11 +2994,11 @@ int QApplication::x11ProcessEvent(XEvent
+@@ -3306,11 +3306,11 @@ int QApplication::x11ProcessEvent(XEvent
QSize oldSize(w->size());
w->data->crect.setWidth(DisplayWidth(X11->display, scr));
w->data->crect.setHeight(DisplayHeight(X11->display, scr));
Modified: branches/qt4-x11/debian/patches/0257-qurl-validate-speedup.diff
===================================================================
--- branches/qt4-x11/debian/patches/0257-qurl-validate-speedup.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/0257-qurl-validate-speedup.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -10,10 +10,10 @@
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
-@@ -3440,6 +3440,8 @@ void QUrlPrivate::validate() const
- that->encodedOriginal = that->toEncoded(); // may detach
- parse(ParseOnly);
+@@ -3547,6 +3547,8 @@ void QUrlPrivate::validate() const
+ QURL_SETFLAG(that->stateFlags, Validated);
+
+ QURL_SETFLAG(that->stateFlags, Validated);
+
if (!isValid)
Added: branches/qt4-x11/debian/patches/0263-fix-fontconfig-handling.diff
===================================================================
--- branches/qt4-x11/debian/patches/0263-fix-fontconfig-handling.diff (rev 0)
+++ branches/qt4-x11/debian/patches/0263-fix-fontconfig-handling.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -0,0 +1,32 @@
+Trolltech task ID : none
+bugs.kde.org number : none
+applied: no
+author: from Trolltech (fixed in Qt 4.5)
+
+Legacy font-name mappings are also applied when fontconfig is used,
+which breaks fontconfig configuration in subtle ways (sans serif
+is mapped to helvetica for example). Avoid this legacy substitution
+when font config is used.
+
+--- a/src/gui/text/qfont.cpp
++++ b/src/gui/text/qfont.cpp
+@@ -59,6 +59,7 @@
+
+ #ifdef Q_WS_X11
+ #include "qx11info_x11.h"
++#include <private/qt_x11_p.h>
+ #endif
+ #ifdef Q_WS_QWS
+ #include "qscreen_qws.h"
+@@ -1781,6 +1782,11 @@ static void initFontSubst()
+ if (!fontSubst->isEmpty())
+ return;
+
++#if defined(Q_WS_X11) && !defined(QT_NO_FONTCONFIG)
++ if (X11->has_fontconfig)
++ return;
++#endif
++
+ for (int i=0; initTbl[i] != 0; i += 2) {
+ QStringList &list = (*fontSubst)[QString::fromLatin1(initTbl[i])];
+ list.append(QString::fromLatin1(initTbl[i+1]));
Added: branches/qt4-x11/debian/patches/0264-fix-zero-height-qpixmap-isnull.diff
===================================================================
--- branches/qt4-x11/debian/patches/0264-fix-zero-height-qpixmap-isnull.diff (rev 0)
+++ branches/qt4-x11/debian/patches/0264-fix-zero-height-qpixmap-isnull.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -0,0 +1,44 @@
+qt-bugs@ issue : N/A
+Trolltech task ID : [waiting]
+bugs.kde.org number : N/A
+applied: yes
+author: Alex Merry <kde at randomguy3.me.uk>
+os: unix
+
+QPixmap::isNull() depends on the width of the pixmap being set to 0
+when either the height or width parameters passed in were 0. But, on
+X11 at least, this doesn't happen. This patch fixes that.
+
+Test case:
+==============================
+#include <QApplication>
+#include <QDebug>
+#include <QPixmap>
+
+int main(int argc, char **argv)
+{
+ QApplication app(argc, argv);
+ QPixmap pm1(0, 8);
+ qWarning() << "Zero-width pixmap isNull():" << pm1.isNull();
+ QPixmap pm2(8, 0);
+ qWarning() << "Zero-height pixmap isNull():" << pm2.isNull();
+ return 0;
+}
+==============================
+Test case result (without patch):
+> Zero-width pixmap isNull(): true
+> Zero-height pixmap isNull(): false
+==============================
+
+
+
+--- a/src/gui/image/qpixmap_x11.cpp
++++ b/src/gui/image/qpixmap_x11.cpp
+@@ -320,6 +320,7 @@ void QX11PixmapData::resize(int width, i
+ if (make_null || w < 0 || h < 0 || d == 0) {
+ hd = 0;
+ picture = 0;
++ w = h = 0;
+ if (!make_null)
+ qWarning("QPixmap: Invalid pixmap parameters");
+ return;
Modified: branches/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
===================================================================
--- branches/qt4-x11/debian/patches/02_launch_assistant-qt4.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/02_launch_assistant-qt4.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -1,6 +1,6 @@
--- a/demos/qtdemo/menumanager.cpp
+++ b/demos/qtdemo/menumanager.cpp
-@@ -285,7 +285,7 @@ void MenuManager::showDocInAssistant(con
+@@ -284,7 +284,7 @@ void MenuManager::showDocInAssistant(con
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/03_launch_moc-qt4.diff
===================================================================
--- branches/qt4-x11/debian/patches/03_launch_moc-qt4.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/03_launch_moc-qt4.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -4,7 +4,7 @@
--- a/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
+++ b/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
-@@ -392,7 +392,7 @@ int main(int argc, char **argv)
+@@ -391,7 +391,7 @@ int main(int argc, char **argv)
else {
// run moc on this file
QProcess proc;
Modified: branches/qt4-x11/debian/patches/04_launch_uic-qt4.diff
===================================================================
--- branches/qt4-x11/debian/patches/04_launch_uic-qt4.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/04_launch_uic-qt4.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -2,7 +2,7 @@
--- a/tools/designer/src/lib/shared/qdesigner_utils.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp
-@@ -482,7 +482,7 @@ namespace qdesigner_internal
+@@ -613,7 +613,7 @@ namespace qdesigner_internal
binary += QDir::separator();
switch (mode) {
case UIC_GenerateCode:
Modified: branches/qt4-x11/debian/patches/05_append_qt4_target.diff
===================================================================
--- branches/qt4-x11/debian/patches/05_append_qt4_target.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/05_append_qt4_target.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -57,7 +57,7 @@
if [ "$VERBOSE" = "yes" ]; then
--- a/configure
+++ b/configure
-@@ -3789,7 +3789,7 @@ END {
+@@ -3929,7 +3929,7 @@ END {
}
# build qmake
@@ -66,7 +66,7 @@
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
-@@ -6031,8 +6031,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -6480,8 +6480,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
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
-@@ -6333,11 +6333,11 @@ EXEC=""
+@@ -6830,11 +6830,11 @@ EXEC=""
#-------------------------------------------------------------------------------
echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@
fi
# .projects -> projects to process
-@@ -6510,7 +6510,7 @@ for file in .projects .projects.3; do
+@@ -7007,7 +7007,7 @@ for file in .projects .projects.3; do
echo " for $a\c"
fi
@@ -102,7 +102,7 @@
if echo '\c' | grep '\c' >/dev/null; then
--- a/projects.pro
+++ b/projects.pro
-@@ -116,7 +116,7 @@ qmake.path=$$[QT_INSTALL_BINS]
+@@ -115,7 +115,7 @@ qmake.path=$$[QT_INSTALL_BINS]
win32 {
qmake.files=$$QT_BUILD_TREE/bin/qmake.exe
} else {
@@ -113,7 +113,7 @@
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
-@@ -98,17 +98,17 @@ CPPFLAGS = -I. -Igenerators -Igenerators
+@@ -99,17 +99,17 @@ CPPFLAGS = -I. -Igenerators -Igenerators
CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)
@@ -137,26 +137,22 @@
makedepend -D__MAKEDEPEND__ $(CPPFLAGS) $(DEPEND_SRC)
--- a/tools/linguist/lrelease/lrelease.pro
+++ b/tools/linguist/lrelease/lrelease.pro
-@@ -29,7 +29,7 @@ HEADERS += $$PROPARSERPATH/proitems.h \
- SOURCES += $$PROPARSERPATH/proitems.cpp \
- $$PROPARSERPATH/proreader.cpp
-
+@@ -1,5 +1,5 @@
+ TEMPLATE = app
-TARGET = lrelease
+TARGET = lrelease-qt4
- INCLUDEPATH += ../shared
DESTDIR = ../../../bin
+ QT -= gui
--- a/tools/linguist/lupdate/lupdate.pro
+++ b/tools/linguist/lupdate/lupdate.pro
-@@ -42,7 +42,7 @@ SOURCES += $$PROPARSERPATH/proitems.cpp
- $$PROPARSERPATH/proreader.cpp
-
-
+@@ -1,5 +1,5 @@
+ TEMPLATE = app
-TARGET = lupdate
+TARGET = lupdate-qt4
- INCLUDEPATH += ../shared
DESTDIR = ../../../bin
+ QT -= gui
--- a/src/tools/moc/moc.pro
+++ b/src/tools/moc/moc.pro
@@ -1,5 +1,5 @@
@@ -164,19 +160,17 @@
-TARGET = moc
+TARGET = moc-qt4
- CONFIG += console qtinc
- CONFIG -= qt
+ DEFINES += QT_MOC
+ DESTDIR = ../../../bin
--- a/src/tools/uic/uic.pro
+++ b/src/tools/uic/uic.pro
-@@ -9,7 +9,7 @@ build_all:!build_pass {
-
- unix:!contains(QT_CONFIG, zlib):LIBS += -lz
-
+@@ -1,5 +1,5 @@
+ TEMPLATE = app
-TARGET = uic
+TARGET = uic-qt4
- DESTDIR = ../../../bin
- DEFINES += QT_BOOTSTRAPPED QT_UIC QT_LITE_UNICODE QT_NO_DATASTREAM \
+ DESTDIR = ../../../bin
+ DEFINES += QT_UIC
--- a/tools/assistant/tools/assistant/assistant.pro
+++ b/tools/assistant/tools/assistant/assistant.pro
@@ -2,7 +2,7 @@ include($$QT_SOURCE_TREE/tools/shared/fo
@@ -201,10 +195,10 @@
include($$QT_SOURCE_TREE/tools/shared/qttoolbardialog/qttoolbardialog.pri)
--- a/tools/linguist/linguist/linguist.pro
+++ b/tools/linguist/linguist/linguist.pro
-@@ -67,7 +67,7 @@ HEADERS += batchtranslationdialog.h \
+@@ -68,7 +68,7 @@ HEADERS += \
+
contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
DEFINES += QT_KEYWORDS
- DESTDIR = ../../../bin
-TARGET = linguist
+TARGET = linguist-qt4
win32:RC_FILE = linguist.rc
Modified: branches/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff
===================================================================
--- branches/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -5,7 +5,7 @@
--- a/configure
+++ b/configure
-@@ -463,6 +463,8 @@ mkdir -p "$outpath/config.tests"
+@@ -495,6 +495,8 @@ mkdir -p "$outpath/config.tests"
rm -f "$outpath/config.tests/.qmake.cache"
cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
Modified: branches/qt4-x11/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff
===================================================================
--- branches/qt4-x11/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -1,6 +1,6 @@
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
-@@ -141,6 +141,8 @@ embedded {
+@@ -146,6 +146,8 @@ embedded {
HEADERS += \
kernel/qeventdispatcher_glib_qws_p.h
QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB
@@ -11,9 +11,9 @@
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
-@@ -63,6 +63,8 @@ SOURCES += \
- painting/qpathclipper.cpp \
- painting/qmemrotate.cpp
+@@ -78,6 +78,8 @@ SOURCES += \
+ painting/qtextureglyphcache.cpp \
+ painting/qtransform.cpp \
+LIBS += -lz
+
Modified: branches/qt4-x11/debian/patches/15_fix_qmake_makefile_generation.diff
===================================================================
--- branches/qt4-x11/debian/patches/15_fix_qmake_makefile_generation.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/15_fix_qmake_makefile_generation.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -1,6 +1,6 @@
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
-@@ -2328,7 +2328,7 @@ MakefileGenerator::writeSubTargets(QText
+@@ -2329,7 +2329,7 @@ MakefileGenerator::writeSubTargets(QText
QString mkfile = subtarget->makefile;
if(!in_directory.isEmpty())
Modified: branches/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff
===================================================================
--- branches/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -2,7 +2,7 @@
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.cpp
-@@ -633,9 +633,12 @@ static QPSQLDriver::Protocol getPSQLVers
+@@ -632,9 +632,12 @@ static QPSQLDriver::Protocol getPSQLVers
serverVersion = QPSQLDriver::Version81;
break;
case 2:
@@ -16,7 +16,7 @@
}
break;
default:
-@@ -916,6 +919,7 @@ QSqlIndex QPSQLDriver::primaryIndex(cons
+@@ -915,6 +918,7 @@ QSqlIndex QPSQLDriver::primaryIndex(cons
case QPSQLDriver::Version8:
case QPSQLDriver::Version81:
case QPSQLDriver::Version82:
@@ -24,7 +24,7 @@
stmt = QLatin1String("SELECT pg_attribute.attname, pg_attribute.atttypid::int, "
"pg_class.relname "
"FROM pg_attribute, pg_class "
-@@ -989,6 +993,7 @@ QSqlRecord QPSQLDriver::record(const QSt
+@@ -988,6 +992,7 @@ QSqlRecord QPSQLDriver::record(const QSt
case QPSQLDriver::Version8:
case QPSQLDriver::Version81:
case QPSQLDriver::Version82:
@@ -34,7 +34,7 @@
"pg_attrdef.adsrc "
--- a/src/sql/drivers/psql/qsql_psql.h
+++ b/src/sql/drivers/psql/qsql_psql.h
-@@ -100,7 +100,8 @@ public:
+@@ -99,7 +99,8 @@ public:
Version74 = 10,
Version8 = 11,
Version81 = 12,
Modified: branches/qt4-x11/debian/patches/40_alpha_ice.diff
===================================================================
--- branches/qt4-x11/debian/patches/40_alpha_ice.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/40_alpha_ice.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -1,6 +1,6 @@
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -72,14 +72,7 @@ class QLibraryInfoPrivate
+@@ -71,14 +71,7 @@ class QLibraryInfoPrivate
{
public:
static QSettings *findConfiguration();
@@ -16,7 +16,7 @@
static QSettings *configuration()
{
#ifdef QT_NO_THREAD
-@@ -98,6 +91,15 @@ public:
+@@ -97,6 +90,15 @@ public:
}
};
@@ -34,7 +34,7 @@
settings = QLibraryInfoPrivate::findConfiguration();
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
-@@ -493,7 +493,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de
+@@ -492,7 +492,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de
}
template <class Key, class T>
Modified: branches/qt4-x11/debian/patches/41_disable_opengl_visibility.diff
===================================================================
--- branches/qt4-x11/debian/patches/41_disable_opengl_visibility.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/41_disable_opengl_visibility.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -2,11 +2,11 @@
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
-@@ -6,6 +6,7 @@ DEFINES += QT_NO_USING_NAMESPACE
- win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000
- solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
+@@ -53,6 +53,7 @@ contains(QT_CONFIG, opengles2) {
+ gl2paintengineex/qpaintengineex_opengl2_p.h
+ }
+QMAKE_CXXFLAGS_HIDESYMS -= -fvisibility-inlines-hidden
- include(../qbase.pri)
-
+ x11 {
+ contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles1cl)|contains(QT_CONFIG, opengles2) {
Modified: branches/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
===================================================================
--- branches/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -4,7 +4,7 @@
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
-@@ -204,6 +204,12 @@ namespace QT_NAMESPACE {}
+@@ -208,6 +208,12 @@ namespace QT_NAMESPACE {}
# 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
-@@ -224,8 +230,6 @@ namespace QT_NAMESPACE {}
+@@ -228,8 +234,6 @@ namespace QT_NAMESPACE {}
# 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
-@@ -286,13 +286,13 @@ static bool qt_parse_pattern(const char
+@@ -285,13 +285,13 @@ static bool qt_parse_pattern(const char
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(QT_NO_PLUGIN_CHECK)
@@ -46,7 +46,7 @@
const char *pattern, ulong p_len)
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
-@@ -74,7 +74,7 @@ QT_END_NAMESPACE
+@@ -73,7 +73,7 @@ QT_END_NAMESPACE
#include <qdebug.h>
#include <time.h>
@@ -55,7 +55,7 @@
# include <fenv.h>
#endif
-@@ -6253,7 +6253,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
+@@ -6536,7 +6536,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
_control87(MCW_EM, MCW_EM);
#endif
@@ -64,7 +64,7 @@
fenv_t envp;
feholdexcept(&envp);
#endif
-@@ -6269,7 +6269,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
+@@ -6552,7 +6552,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
#endif //_M_X64
#endif //Q_OS_WIN
Modified: branches/qt4-x11/debian/patches/71_hppa_unaligned_access_fix_458133.diff
===================================================================
--- branches/qt4-x11/debian/patches/71_hppa_unaligned_access_fix_458133.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/71_hppa_unaligned_access_fix_458133.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -4,7 +4,7 @@
--- a/src/3rdparty/sha1/sha1.cpp
+++ b/src/3rdparty/sha1/sha1.cpp
-@@ -145,10 +145,10 @@ static inline void sha1ProcessChunk(Sha1
+@@ -144,10 +144,10 @@ static inline void sha1ProcessChunk(Sha1
quint32 d = state->h3;
quint32 e = state->h4;
@@ -18,7 +18,7 @@
for (int i = 0; i < 16; ++i)
chunk->words[i] = qFromBigEndian(chunk->words[i]);
-@@ -184,7 +184,7 @@ static inline void sha1ProcessChunk(Sha1
+@@ -183,7 +183,7 @@ static inline void sha1ProcessChunk(Sha1
// Wipe variables
#ifdef SHA1_WIPE_VARIABLES
a = b = c = d = e = 0;
Modified: branches/qt4-x11/debian/patches/80_hurd_max_path.diff
===================================================================
--- branches/qt4-x11/debian/patches/80_hurd_max_path.diff 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/80_hurd_max_path.diff 2009-01-11 20:21:33 UTC (rev 13309)
@@ -2,7 +2,7 @@
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
-@@ -60,6 +60,10 @@
+@@ -59,6 +59,10 @@
QT_BEGIN_NAMESPACE
Modified: branches/qt4-x11/debian/patches/series
===================================================================
--- branches/qt4-x11/debian/patches/series 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/patches/series 2009-01-11 20:21:33 UTC (rev 13309)
@@ -1,25 +1,27 @@
# qt-copy patches
-0167-fix-group-reading.diff
+#0167-fix-group-reading.diff
0180-window-role.diff
0195-compositing-properties.diff
-0203-qtexthtmlparser-link-color.diff
+#0203-qtexthtmlparser-link-color.diff
0209-prevent-qt-mixing.diff
0216-allow-isystem-for-headers.diff
-0224-fast-qpixmap-fill.diff
+#0224-fast-qpixmap-fill.diff
0225-invalidate-tabbar-geometry-on-refresh.patch
-0226-qtreeview-column_resize_when_needed.diff
+#0226-qtreeview-column_resize_when_needed.diff
0234-fix-mysql-threaded.diff
-0238-fix-qt-qttabbar-size.diff
+#0238-fix-qt-qttabbar-size.diff
0245-fix-randr-changes-detecting.diff
-0248-fix-qwidget-scroll-slowness.diff
-0249-webkit-stale-frame-pointer.diff
-0254-fix-qgraphicsproxywidget-deletion-crash.diff
-0255-qtreeview-selection-columns-hidden.diff
-0256-fix-recursive-backingstore-sync-crash.diff
+#0248-fix-qwidget-scroll-slowness.diff
+#0249-webkit-stale-frame-pointer.diff
+#0254-fix-qgraphicsproxywidget-deletion-crash.diff
+#0255-qtreeview-selection-columns-hidden.diff
+#0256-fix-recursive-backingstore-sync-crash.diff
0257-qurl-validate-speedup.diff
-0260-fix-qgraphicswidget-deletionclearFocus.diff
-0261-sync-before-reset-errorhandler.patch
-0262-fix-treeview-animation-crash.diff
+#0260-fix-qgraphicswidget-deletionclearFocus.diff
+#0261-sync-before-reset-errorhandler.patch
+#0262-fix-treeview-animation-crash.diff
+#0263-fix-fontconfig-handling.diff
+#0264-fix-zero-height-qpixmap-isnull.diff
# debian patches
01_qmake_for_debian.diff
@@ -30,13 +32,13 @@
07_trust_dpkg-arch_over_uname-m.diff
09_qmake_lflags_as-needed.diff
10_config_tests_fixes.diff
-12_fix_qmake_pkgconfig.diff
+#12_fix_qmake_pkgconfig.diff
14_add_libraries_to_gui_build_where_actually_needed.diff
15_fix_qmake_makefile_generation.diff
-16_hide_std_symbols_on_qtwebkit.diff
+#16_hide_std_symbols_on_qtwebkit.diff
17_add_postgresql_8.3_support.diff
-20_mips_atomic_ops.diff
-30_webkit_unaligned_access.diff
+#20_mips_atomic_ops.diff
+#30_webkit_unaligned_access.diff
40_alpha_ice.diff
41_disable_opengl_visibility.diff
50_kfreebsd_build_fix.diff
Modified: branches/qt4-x11/debian/qt4-dev-tools.install
===================================================================
--- branches/qt4-x11/debian/qt4-dev-tools.install 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/qt4-dev-tools.install 2009-01-11 20:21:33 UTC (rev 13309)
@@ -15,8 +15,9 @@
usr/share/qt4/translations/assistant_adp_zh_TW.qm
usr/share/qt4/translations/assistant_de.qm
usr/share/qt4/translations/assistant_pl.qm
-usr/share/qt4/translations/assistant_zh_CN.qm
-usr/share/qt4/translations/assistant_zh_TW.qm
+# Disable for unofficial release like snapshots
+#usr/share/qt4/translations/assistant_zh_CN.qm
+#usr/share/qt4/translations/assistant_zh_TW.qm
usr/share/qt4/translations/linguist_de.qm
usr/share/qt4/translations/linguist_ja.qm
usr/share/qt4/translations/linguist_pl.qm
Modified: branches/qt4-x11/debian/qt4-doc-html.install
===================================================================
--- branches/qt4-x11/debian/qt4-doc-html.install 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/qt4-doc-html.install 2009-01-11 20:21:33 UTC (rev 13309)
@@ -1,2 +1,3 @@
-usr/share/qt4/doc/html
+# Disable for unofficial release like snapshots
+#usr/share/qt4/doc/html
Modified: branches/qt4-x11/debian/qt4-doc.install
===================================================================
--- branches/qt4-x11/debian/qt4-doc.install 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/qt4-doc.install 2009-01-11 20:21:33 UTC (rev 13309)
@@ -1,3 +1,4 @@
-usr/share/qt4/doc/qch
+# Disable for unofficial release like snapshots
+#usr/share/qt4/doc/qch
usr/share/qt4/doc/src
Modified: branches/qt4-x11/debian/qt4-qtconfig.install
===================================================================
--- branches/qt4-x11/debian/qt4-qtconfig.install 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/qt4-qtconfig.install 2009-01-11 20:21:33 UTC (rev 13309)
@@ -2,4 +2,3 @@
usr/share/qt4/translations/qtconfig_pl.qm
usr/share/qt4/translations/qtconfig_zh_CN.qm
usr/share/qt4/translations/qtconfig_zh_TW.qm
-
Modified: branches/qt4-x11/debian/rules
===================================================================
--- branches/qt4-x11/debian/rules 2009-01-11 11:24:49 UTC (rev 13308)
+++ branches/qt4-x11/debian/rules 2009-01-11 20:21:33 UTC (rev 13309)
@@ -33,7 +33,7 @@
DEB_DH_SHLIBDEPS_ARGS_ALL := --exclude=.debug
-# Disable for unofficial release like betas, rcs and snapshots
+# Disable for unofficial release like snapshots
#DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
DEB_INSTALL_DOCS_ALL := GPL_EXCEPTION_ADDENDUM.TXT
@@ -251,9 +251,10 @@
# Run dh_install without the default DEB_DH_INSTALL_ARGS to install the *.debug files
dh_install -plibqt4-xmlpatterns-dbg --sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)
-binary-post-install/libqt4-dev::
- install -D -p -m0644 doc/html/qt.tags \
- $(DEB_DESTDIR)/usr/share/qt4/doc/html/qt.tags
+# Disable for unofficial release like snapshots
+#binary-post-install/libqt4-dev::
+# install -D -p -m0644 doc/html/qt.tags \
+# $(DEB_DESTDIR)/usr/share/qt4/doc/html/qt.tags
# Automatically install lintian overrides, stolen from debian-qt-kde.mk
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
More information about the pkg-kde-commits
mailing list