rev 14487 - in trunk/packages/qt4-x11/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Thu Apr 23 13:47:04 UTC 2009
Author: fabo
Date: 2009-04-23 13:47:04 +0000 (Thu, 23 Apr 2009)
New Revision: 14487
Removed:
trunk/packages/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff
trunk/packages/qt4-x11/debian/patches/0275-qtconcurrent-threadcount.diff
trunk/packages/qt4-x11/debian/patches/0276-webkit-pedantic.diff
trunk/packages/qt4-x11/debian/patches/0278-X11-Use-legacy-LCD-filtering-if-specified-in-font-c.diff
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/libqt4-dbg.lintian
trunk/packages/qt4-x11/debian/libqt4-webkit-dbg.lintian
trunk/packages/qt4-x11/debian/libqt4-xmlpatterns-dbg.lintian
trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
trunk/packages/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff
trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff
trunk/packages/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff
trunk/packages/qt4-x11/debian/patches/0274-shm-native-image-fix.diff
trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff
trunk/packages/qt4-x11/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff
trunk/packages/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff
trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff
trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
trunk/packages/qt4-x11/debian/patches/series
trunk/packages/qt4-x11/debian/rules
Log:
Refresh patches.
Remove q-copy patches - fixed upstream: 0245, 0275, 0276 and 0278.
Update lintian files.
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/changelog 2009-04-23 13:47:04 UTC (rev 14487)
@@ -1,4 +1,4 @@
-qt4-x11 (4.5.1-1) UNRELEASED; urgency=low
+qt4-x11 (4.5.1-1) unstable; urgency=low
* New upstream release:
- QHostAddress: Fixed compilation by adding a missing QPair include.
@@ -11,6 +11,12 @@
Don't try to use special hand assembly for printing the boilerplate
message on ia64, since it causes a build failure due to undefined
symbols. Thanks to Steve Langasek.
+ * Remove qt-copy patches:
+ - 0245-fix-randr-changes-detecting.diff - Fixed upstream.
+ - 0275-qtconcurrent-threadcount.diff - Fixed upstream.
+ - 0276-webkit-pedantic.diff - Fixed upstream.
+ - 0278-X11-Use-legacy-LCD-filtering-if-specified-in-font-c.diff - Fixed
+ upstream.
-- Fathi Boudra <fabo at debian.org> Thu, 23 Apr 2009 14:23:06 +0200
Modified: trunk/packages/qt4-x11/debian/libqt4-dbg.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-dbg.lintian 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/libqt4-dbg.lintian 2009-04-23 13:47:04 UTC (rev 14487)
@@ -1,20 +1,20 @@
-libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQt3Support.so.4.5.0.debug
-libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtAssistantClient.so.4.5.0.debug
-libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtCLucene.so.4.5.0.debug
-libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtCore.so.4.5.0.debug
-libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtDBus.so.4.5.0.debug
-libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtDesigner.so.4.5.0.debug
-libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtDesignerComponents.so.4.5.0.debug
-libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtGui.so.4.5.0.debug
-libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtHelp.so.4.5.0.debug
-libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtNetwork.so.4.5.0.debug
-libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtOpenGL.so.4.5.0.debug
-libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtScript.so.4.5.0.debug
-libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtScriptTools.so.4.5.0.debug
-libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtSql.so.4.5.0.debug
-libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtSvg.so.4.5.0.debug
-libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtTest.so.4.5.0.debug
-libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtXml.so.4.5.0.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQt3Support.so.4.5.1.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtAssistantClient.so.4.5.1.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtCLucene.so.4.5.1.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtCore.so.4.5.1.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtDBus.so.4.5.1.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtDesigner.so.4.5.1.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtDesignerComponents.so.4.5.1.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtGui.so.4.5.1.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtHelp.so.4.5.1.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtNetwork.so.4.5.1.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtOpenGL.so.4.5.1.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtScript.so.4.5.1.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtScriptTools.so.4.5.1.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtSql.so.4.5.1.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtSvg.so.4.5.1.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtTest.so.4.5.1.debug
+libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtXml.so.4.5.1.debug
libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so.debug
libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so.debug
libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/codecs/libqcncodecs.so.debug
@@ -37,23 +37,23 @@
libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/sqldrivers/libqsqlmysql.so.debug
libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/sqldrivers/libqsqlodbc.so.debug
libqt4-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/sqldrivers/libqsqlpsql.so.debug
-libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQt3Support.so.4.5.0.debug
-libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtAssistantClient.so.4.5.0.debug
-libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtCLucene.so.4.5.0.debug
-libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtCore.so.4.5.0.debug
-libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtDBus.so.4.5.0.debug
-libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtDesigner.so.4.5.0.debug
-libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtDesignerComponents.so.4.5.0.debug
-libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtGui.so.4.5.0.debug
-libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtHelp.so.4.5.0.debug
-libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtNetwork.so.4.5.0.debug
-libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtOpenGL.so.4.5.0.debug
-libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtScript.so.4.5.0.debug
-libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtScriptTools.so.4.5.0.debug
-libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtSql.so.4.5.0.debug
-libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtSvg.so.4.5.0.debug
-libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtTest.so.4.5.0.debug
-libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtXml.so.4.5.0.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQt3Support.so.4.5.1.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtAssistantClient.so.4.5.1.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtCLucene.so.4.5.1.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtCore.so.4.5.1.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtDBus.so.4.5.1.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtDesigner.so.4.5.1.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtDesignerComponents.so.4.5.1.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtGui.so.4.5.1.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtHelp.so.4.5.1.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtNetwork.so.4.5.1.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtOpenGL.so.4.5.1.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtScript.so.4.5.1.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtScriptTools.so.4.5.1.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtSql.so.4.5.1.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtSvg.so.4.5.1.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtTest.so.4.5.1.debug
+libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/libQtXml.so.4.5.1.debug
libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so.debug
libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so.debug
libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/codecs/libqcncodecs.so.debug
@@ -76,20 +76,20 @@
libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/sqldrivers/libqsqlmysql.so.debug
libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/sqldrivers/libqsqlodbc.so.debug
libqt4-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/sqldrivers/libqsqlpsql.so.debug
-libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQt3Support.so.4.5.0.debug
-libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtAssistantClient.so.4.5.0.debug
-libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtCLucene.so.4.5.0.debug
-libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtCore.so.4.5.0.debug
-libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtDBus.so.4.5.0.debug
-libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtDesigner.so.4.5.0.debug
-libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtDesignerComponents.so.4.5.0.debug
-libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtGui.so.4.5.0.debug
-libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtHelp.so.4.5.0.debug
-libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtNetwork.so.4.5.0.debug
-libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtOpenGL.so.4.5.0.debug
-libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtScript.so.4.5.0.debug
-libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtScriptTools.so.4.5.0.debug
-libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtSql.so.4.5.0.debug
-libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtSvg.so.4.5.0.debug
-libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtTest.so.4.5.0.debug
-libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtXml.so.4.5.0.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQt3Support.so.4.5.1.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtAssistantClient.so.4.5.1.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtCLucene.so.4.5.1.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtCore.so.4.5.1.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtDBus.so.4.5.1.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtDesigner.so.4.5.1.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtDesignerComponents.so.4.5.1.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtGui.so.4.5.1.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtHelp.so.4.5.1.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtNetwork.so.4.5.1.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtOpenGL.so.4.5.1.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtScript.so.4.5.1.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtScriptTools.so.4.5.1.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtSql.so.4.5.1.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtSvg.so.4.5.1.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtTest.so.4.5.1.debug
+libqt4-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtXml.so.4.5.1.debug
Modified: trunk/packages/qt4-x11/debian/libqt4-webkit-dbg.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-webkit-dbg.lintian 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/libqt4-webkit-dbg.lintian 2009-04-23 13:47:04 UTC (rev 14487)
@@ -1,5 +1,5 @@
-libqt4-webkit-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtWebKit.so.4.5.0.debug
+libqt4-webkit-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtWebKit.so.4.5.1.debug
libqt4-webkit-dbg: binary-with-bad-dynamic-table ./usr/lib/qt4/plugins/designer/libqwebview.so.debug
-libqt4-webkit-dbg: shared-lib-without-dependency-information ./usr/lib/libQtWebKit.so.4.5.0.debug
+libqt4-webkit-dbg: shared-lib-without-dependency-information ./usr/lib/libQtWebKit.so.4.5.1.debug
libqt4-webkit-dbg: shared-lib-without-dependency-information ./usr/lib/qt4/plugins/designer/libqwebview.so.debug
-libqt4-webkit-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtWebKit.so.4.5.0.debug
+libqt4-webkit-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtWebKit.so.4.5.1.debug
Modified: trunk/packages/qt4-x11/debian/libqt4-xmlpatterns-dbg.lintian
===================================================================
--- trunk/packages/qt4-x11/debian/libqt4-xmlpatterns-dbg.lintian 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/libqt4-xmlpatterns-dbg.lintian 2009-04-23 13:47:04 UTC (rev 14487)
@@ -1,3 +1,3 @@
-libqt4-xmlpatterns-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtXmlPatterns.so.4.5.0.debug
-libqt4-xmlpatterns-dbg: shared-lib-without-dependency-information ./usr/lib/libQtXmlPatterns.so.4.5.0.debug
-libqt4-xmlpatterns-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtXmlPatterns.so.4.5.0.debug
+libqt4-xmlpatterns-dbg: binary-with-bad-dynamic-table ./usr/lib/libQtXmlPatterns.so.4.5.1.debug
+libqt4-xmlpatterns-dbg: shared-lib-without-dependency-information ./usr/lib/libQtXmlPatterns.so.4.5.1.debug
+libqt4-xmlpatterns-dbg: sharedobject-in-library-directory-missing-soname usr/lib/libQtXmlPatterns.so.4.5.1.debug
Modified: trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0180-window-role.diff 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/patches/0180-window-role.diff 2009-04-23 13:47:04 UTC (rev 14487)
@@ -47,7 +47,7 @@
struct Connection
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
-@@ -360,6 +360,7 @@ public:
+@@ -358,6 +358,7 @@ public:
#if defined(Q_WS_X11)
void setWindowRole();
@@ -57,7 +57,7 @@
void x11UpdateIsOpaque();
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -765,13 +765,17 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -778,13 +778,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
-@@ -2737,6 +2741,17 @@ void QWidgetPrivate::setWindowRole()
+@@ -2768,6 +2772,17 @@ void QWidgetPrivate::setWindowRole()
(unsigned char *)windowRole.constData(), windowRole.length());
}
Modified: trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff 2009-04-23 13:47:04 UTC (rev 14487)
@@ -9,7 +9,7 @@
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -706,6 +706,11 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -719,6 +719,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();
-@@ -756,13 +761,21 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -769,13 +774,21 @@ void QWidgetPrivate::create_sys(WId wind
// set EWMH window types
setNetWmWindowTypes();
@@ -45,7 +45,7 @@
// declare the widget's window role
QByteArray windowRole;
-@@ -782,10 +795,6 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -795,10 +808,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: trunk/packages/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff 2009-04-23 13:47:04 UTC (rev 14487)
@@ -24,7 +24,7 @@
--- a/configure
+++ b/configure
-@@ -845,6 +845,11 @@ while [ "$#" -gt 0 ]; do
+@@ -927,6 +927,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
-@@ -1805,6 +1810,9 @@ while [ "$#" -gt 0 ]; do
+@@ -1890,6 +1895,9 @@ while [ "$#" -gt 0 ]; do
add_ipath)
I_FLAGS="$I_FLAGS -I\"${VAL}\""
;;
Modified: trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff 2009-04-23 13:47:04 UTC (rev 14487)
@@ -9,7 +9,7 @@
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
-@@ -1257,6 +1257,10 @@ bool QMYSQLDriver::open(const QString& d
+@@ -1258,6 +1258,10 @@ bool QMYSQLDriver::open(const QString& d
d->preparedQuerysEnabled = false;
#endif
@@ -20,7 +20,7 @@
setOpen(true);
setOpenError(false);
return true;
-@@ -1265,6 +1269,9 @@ bool QMYSQLDriver::open(const QString& d
+@@ -1266,6 +1270,9 @@ bool QMYSQLDriver::open(const QString& d
void QMYSQLDriver::close()
{
if (isOpen()) {
Modified: trunk/packages/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff 2009-04-23 13:47:04 UTC (rev 14487)
@@ -31,7 +31,7 @@
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
-@@ -3532,7 +3532,7 @@ QList<QPair<int, int> > QTreeViewPrivate
+@@ -3575,7 +3575,7 @@ QList<QPair<int, int> > QTreeViewPrivate
current.first = -2; // -1 is not enough because -1+1 = 0
current.second = -2;
foreach (int logicalColumn, logicalIndexes) {
Modified: trunk/packages/qt4-x11/debian/patches/0274-shm-native-image-fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0274-shm-native-image-fix.diff 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/patches/0274-shm-native-image-fix.diff 2009-04-23 13:47:04 UTC (rev 14487)
@@ -23,7 +23,7 @@
#elif defined(Q_WS_MAC)
--- a/src/gui/image/qnativeimage.cpp
+++ b/src/gui/image/qnativeimage.cpp
-@@ -145,7 +145,6 @@ QNativeImage::QNativeImage(int width, in
+@@ -147,7 +147,6 @@ QNativeImage::QNativeImage(int width, in
{
if (!X11->use_mitshm) {
xshmimg = 0;
@@ -31,7 +31,7 @@
image = QImage(width, height, format);
return;
}
-@@ -189,11 +188,6 @@ QNativeImage::QNativeImage(int width, in
+@@ -191,11 +190,6 @@ QNativeImage::QNativeImage(int width, in
shmctl(xshminfo.shmid, IPC_RMID, 0);
return;
}
@@ -43,7 +43,7 @@
}
-@@ -202,10 +196,6 @@ QNativeImage::~QNativeImage()
+@@ -204,10 +198,6 @@ QNativeImage::~QNativeImage()
if (!xshmimg)
return;
@@ -78,7 +78,7 @@
#endif
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
-@@ -1943,7 +1943,7 @@ void qt_init(QApplicationPrivate *priv,
+@@ -1952,7 +1952,7 @@ void qt_init(QApplicationPrivate *priv,
// to determine whether the display is local or not (not 100 % accurate)
bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0;
if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0))
Modified: trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff 2009-04-23 13:47:04 UTC (rev 14487)
@@ -1,6 +1,6 @@
--- a/demos/qtdemo/menumanager.cpp
+++ b/demos/qtdemo/menumanager.cpp
-@@ -289,7 +289,7 @@ void MenuManager::showDocInAssistant(con
+@@ -286,7 +286,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: trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff 2009-04-23 13:47:04 UTC (rev 14487)
@@ -57,7 +57,7 @@
if [ "$VERBOSE" = "yes" ]; then
--- a/configure
+++ b/configure
-@@ -3923,7 +3923,7 @@ END {
+@@ -4014,7 +4014,7 @@ END {
}
# build qmake
@@ -66,7 +66,7 @@
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
-@@ -6499,8 +6499,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -6643,8 +6643,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
-@@ -6849,11 +6849,11 @@ EXEC=""
+@@ -6993,11 +6993,11 @@ EXEC=""
#-------------------------------------------------------------------------------
echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@
fi
# .projects -> projects to process
-@@ -7026,7 +7026,7 @@ for file in .projects .projects.3; do
+@@ -7170,7 +7170,7 @@ for file in .projects .projects.3; do
echo " for $a\c"
fi
Modified: trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff 2009-04-23 13:47:04 UTC (rev 14487)
@@ -5,7 +5,7 @@
--- a/configure
+++ b/configure
-@@ -495,6 +495,8 @@ mkdir -p "$outpath/config.tests"
+@@ -583,6 +583,8 @@ mkdir -p "$outpath/config.tests"
rm -f "$outpath/config.tests/.qmake.cache"
cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
Modified: trunk/packages/qt4-x11/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/patches/14_add_libraries_to_gui_build_where_actually_needed.diff 2009-04-23 13:47:04 UTC (rev 14487)
@@ -11,7 +11,7 @@
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
-@@ -78,6 +78,8 @@ SOURCES += \
+@@ -79,6 +79,8 @@ SOURCES += \
painting/qtextureglyphcache.cpp \
painting/qtransform.cpp \
Modified: trunk/packages/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff 2009-04-23 13:47:04 UTC (rev 14487)
@@ -2,7 +2,7 @@
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.cpp
-@@ -637,9 +637,12 @@ static QPSQLDriver::Protocol getPSQLVers
+@@ -638,9 +638,12 @@ static QPSQLDriver::Protocol getPSQLVers
serverVersion = QPSQLDriver::Version81;
break;
case 2:
@@ -16,7 +16,7 @@
}
break;
default:
-@@ -920,6 +923,7 @@ QSqlIndex QPSQLDriver::primaryIndex(cons
+@@ -921,6 +924,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 "
-@@ -993,6 +997,7 @@ QSqlRecord QPSQLDriver::record(const QSt
+@@ -994,6 +998,7 @@ QSqlRecord QPSQLDriver::record(const QSt
case QPSQLDriver::Version8:
case QPSQLDriver::Version81:
case QPSQLDriver::Version82:
Modified: trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff 2009-04-23 13:47:04 UTC (rev 14487)
@@ -2,7 +2,7 @@
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
-@@ -53,6 +53,7 @@ contains(QT_CONFIG, opengles2) {
+@@ -51,6 +51,7 @@ contains(QT_CONFIG, opengles2) {
gl2paintengineex/qpaintengineex_opengl2_p.h
}
Modified: trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff 2009-04-23 13:47:04 UTC (rev 14487)
@@ -55,7 +55,7 @@
# include <fenv.h>
#endif
-@@ -6541,7 +6541,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
+@@ -6544,7 +6544,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
-@@ -6557,7 +6557,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
+@@ -6560,7 +6560,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
#endif //_M_X64
#endif //Q_OS_WIN
Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/patches/series 2009-04-23 13:47:04 UTC (rev 14487)
@@ -5,13 +5,9 @@
0216-allow-isystem-for-headers.diff
0225-invalidate-tabbar-geometry-on-refresh.patch
0234-fix-mysql-threaded.diff
-0245-fix-randr-changes-detecting.diff
0255-qtreeview-selection-columns-hidden.diff
0273-odbc-64bit-compile.diff
0274-shm-native-image-fix.diff
-0275-qtconcurrent-threadcount.diff
-0276-webkit-pedantic.diff
-0278-X11-Use-legacy-LCD-filtering-if-specified-in-font-c.diff
# debian patches
01_qmake_for_debian.diff
Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules 2009-04-23 12:34:55 UTC (rev 14486)
+++ trunk/packages/qt4-x11/debian/rules 2009-04-23 13:47:04 UTC (rev 14487)
@@ -28,7 +28,7 @@
# Shlibs of the current upstream version
#DEB_DH_MAKESHLIBS_ARGS_ALL := -V
# Specific shlibs version
-SHLIBSVERSION := 4.5.0
+SHLIBSVERSION := 4.5.1
$(foreach libpkg,$(filter-out %-dev %-dbg,$(filter lib%,$(DEB_ARCH_PACKAGES))),$(eval DEB_DH_MAKESHLIBS_ARGS_$(libpkg) := -V'$(libpkg) (>= $(SHLIBSVERSION))'))
DEB_DH_STRIP_ARGS_libqt4-dbg := --exclude=.debug
More information about the pkg-kde-commits
mailing list