rev 9957 - in branches/qt4-x11/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-04-03 18:21:52 +0000 (Thu, 03 Apr 2008)
New Revision: 9957

Modified:
   branches/qt4-x11/debian/changelog
   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/0220-no-x-recursion-in-xerrhandler.diff
   branches/qt4-x11/debian/patches/series
Log:
Make all patches apply with -p1

Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog	2008-04-03 18:14:52 UTC (rev 9956)
+++ branches/qt4-x11/debian/changelog	2008-04-03 18:21:52 UTC (rev 9957)
@@ -8,8 +8,8 @@
     * 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.
+    * 0203-qtexthtmlparser-link-color.diff - adjust offsets.
+    * 0209-prevent-qt-mixing.diff - adjust offsets.
     * 0214-fix-qgraphicsproxywidget-tab-crash.diff - adjust offsets.
     * 0216-allow-isystem-for-headers.diff - adjust offsets.
   * Remove qt-copy patches:
@@ -20,7 +20,7 @@
     * 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.
+    * 0220-no-x-recursion-in-xerrhandler.diff - adjust offsets.
   * Refresh Debian patches:
     * 02_launch_assistant-qt4.diff - adjust offsets.
     * 05_append_qt4_target.diff - adopt to upstream changes.
@@ -29,7 +29,7 @@
   * 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
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 03 Apr 2008 21:17:04 +0300
 
 qt4-x11 (4.4.0~beta1-1) experimental; urgency=low
 

Modified: branches/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
===================================================================
--- branches/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff	2008-04-03 18:14:52 UTC (rev 9956)
+++ branches/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff	2008-04-03 18:21:52 UTC (rev 9957)
@@ -5,8 +5,8 @@
 
 Links are assigned a foreground color according to the system current color scheme.
 
---- src/gui/text/qtexthtmlparser.cpp	(revisión: 745183)
-+++ src/gui/text/qtexthtmlparser.cpp	(copia de trabajo)
+--- a/src/gui/text/qtexthtmlparser.cpp	(revisión: 745183)
++++ b/src/gui/text/qtexthtmlparser.cpp	(copia de trabajo)
 @@ -1053,7 +1053,7 @@ void QTextHtmlParserNode::initializeProp
                      && !attributes.at(i + 1).isEmpty()) {
                      hasHref = true;

Modified: branches/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff
===================================================================
--- branches/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff	2008-04-03 18:14:52 UTC (rev 9956)
+++ branches/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff	2008-04-03 18:21:52 UTC (rev 9957)
@@ -13,8 +13,8 @@
 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.
 
---- 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
+--- a/src/corelib/kernel/qobject_p.h.sav	2008-01-29 19:37:26.000000000 +0100
++++ b/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/0220-no-x-recursion-in-xerrhandler.diff
===================================================================
--- branches/qt4-x11/debian/patches/0220-no-x-recursion-in-xerrhandler.diff	2008-04-03 18:14:52 UTC (rev 9956)
+++ branches/qt4-x11/debian/patches/0220-no-x-recursion-in-xerrhandler.diff	2008-04-03 18:21:52 UTC (rev 9957)
@@ -9,8 +9,8 @@
 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
+--- a/src/gui/kernel/qdnd_x11.cpp.sav	2008-03-01 02:33:57.000000000 +0100
++++ b/src/gui/kernel/qdnd_x11.cpp	2008-04-03 14:33:02.000000000 +0200
 @@ -1700,21 +1700,23 @@ void QDragManager::drop()
  
  bool QX11Data::xdndHandleBadwindow()

Modified: branches/qt4-x11/debian/patches/series
===================================================================
--- branches/qt4-x11/debian/patches/series	2008-04-03 18:14:52 UTC (rev 9956)
+++ branches/qt4-x11/debian/patches/series	2008-04-03 18:21:52 UTC (rev 9957)
@@ -4,12 +4,12 @@
 0191-listview-alternate-row-colors.diff
 0192-itemdelegate-palette-state.diff
 0195-compositing-properties.diff
-0203-qtexthtmlparser-link-color.diff -p0
-0209-prevent-qt-mixing.diff -p0
+0203-qtexthtmlparser-link-color.diff
+0209-prevent-qt-mixing.diff
 0210-fix-crash-q3stylesheet-font-size.diff
 0214-fix-qgraphicsproxywidget-tab-crash.diff
 0216-allow-isystem-for-headers.diff
-0220-no-x-recursion-in-xerrhandler.diff -p0
+0220-no-x-recursion-in-xerrhandler.diff
 
 # debian patches
 01_qmake_for_debian.diff