diff options
| author | Sune Vuorela <debian@pusling.com> | 2008-07-09 00:31:31 +0000 |
|---|---|---|
| committer | Sune Vuorela <debian@pusling.com> | 2008-07-09 00:31:31 +0000 |
| commit | 1769b05ea1b809dd409a24f69c96c810d001b951 (patch) | |
| tree | b91dbb690038d6df25f25ce793df1bb44a4c7218 | |
| parent | b94481065d9b121f6eba195673a312f1521b345a (diff) | |
| download | qt4-x11-1769b05ea1b809dd409a24f69c96c810d001b951.tar.gz | |
fix recently committed patches to be applied with -p1 as expected. also reorder patches properly in series file
| -rw-r--r-- | debian/patches/0235-qdbus-dispatch-async-timeout.diff | 4 | ||||
| -rw-r--r-- | debian/patches/0236-qtoolbararealayout-restore.diff | 6 | ||||
| -rw-r--r-- | debian/patches/series | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/0235-qdbus-dispatch-async-timeout.diff b/debian/patches/0235-qdbus-dispatch-async-timeout.diff index 9fd4796..edd7fe7 100644 --- a/debian/patches/0235-qdbus-dispatch-async-timeout.diff +++ b/debian/patches/0235-qdbus-dispatch-async-timeout.diff @@ -8,8 +8,8 @@ This patch dispatches synthesized timeout messages directly after handling them. This is neccessary in order to receive timeout errors to asynchroneous messages. ---- src/dbus/qdbusintegrator.cpp (Revision 827848) -+++ src/dbus/qdbusintegrator.cpp (Arbeitskopie) +--- a/src/dbus/qdbusintegrator.cpp (Revision 827848) ++++ b/src/dbus/qdbusintegrator.cpp (Arbeitskopie) @@ -988,6 +988,7 @@ { DBusTimeout *timeout = timeouts.value(e->timerId(), 0); diff --git a/debian/patches/0236-qtoolbararealayout-restore.diff b/debian/patches/0236-qtoolbararealayout-restore.diff index df6af36..3f461b3 100644 --- a/debian/patches/0236-qtoolbararealayout-restore.diff +++ b/debian/patches/0236-qtoolbararealayout-restore.diff @@ -7,10 +7,10 @@ author: TT QMainWindow::restoreState doesn't layout toolbars properly, regression from Qt-4.4 -Index: src/gui/widgets/qtoolbararealayout.cpp +Index: a/src/gui/widgets/qtoolbararealayout.cpp =================================================================== ---- src/gui/widgets/qtoolbararealayout.cpp (revision 829449) -+++ src/gui/widgets/qtoolbararealayout.cpp (working copy) +--- a/src/gui/widgets/qtoolbararealayout.cpp (revision 829449) ++++ b/src/gui/widgets/qtoolbararealayout.cpp (working copy) @@ -1323,7 +1323,8 @@ bool QToolBarAreaLayout::restoreState(QD toolBar->setVisible(shown); toolBar->d_func()->setWindowState(floating, true, rect); diff --git a/debian/patches/series b/debian/patches/series index 041747f..3284ff2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -19,10 +19,10 @@ 0228-qsortfilterproxymodel-invalidate-noscroll.diff 0230-qtextcontrol-selectnextword.diff 0233-fix-q3textbrowser-image.diff +0235-qdbus-dispatch-async-timeout.diff +0236-qtoolbararealayout-restore.diff # debian patches -0236-qtoolbararealayout-restore.diff -0235-qdbus-dispatch-async-timeout.diff 01_qmake_for_debian.diff 02_launch_assistant-qt4.diff 03_launch_moc-qt4.diff |