diff options
author | Fathi Boudra <fabo@debian.org> | 2009-12-01 20:25:23 +0100 |
---|---|---|
committer | Fathi Boudra <fabo@debian.org> | 2009-12-01 20:25:23 +0100 |
commit | 4b9acb4cfe15e65a912152287f21706f361a2830 (patch) | |
tree | e9f439baacee205d12a96d3ea6642ff267b354d3 | |
parent | d6dace847d56ab730f026d23f9ab1637859fc51d (diff) | |
download | qt4-x11-4b9acb4cfe15e65a912152287f21706f361a2830.tar.gz |
Refresh patches
-rw-r--r-- | debian/patches/0180-window-role.diff | 8 | ||||
-rw-r--r-- | debian/patches/0195-compositing-properties.diff | 6 | ||||
-rw-r--r-- | debian/patches/0216-allow-isystem-for-headers.diff | 4 | ||||
-rw-r--r-- | debian/patches/05_append_qt4_target.diff | 8 | ||||
-rw-r--r-- | debian/patches/08_configure_quilt_compat.diff | 2 | ||||
-rw-r--r-- | debian/patches/09_qmake_lflags_as-needed.diff | 2 | ||||
-rw-r--r-- | debian/patches/12_add_nostrip_for_debug_packages.diff | 2 | ||||
-rw-r--r-- | debian/patches/30_webkit_unaligned_access.diff | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/debian/patches/0180-window-role.diff b/debian/patches/0180-window-role.diff index 355c21d..e16af4b 100644 --- a/debian/patches/0180-window-role.diff +++ b/debian/patches/0180-window-role.diff @@ -21,7 +21,7 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp -@@ -1124,8 +1124,16 @@ void QObject::setObjectName(const QStrin +@@ -1136,8 +1136,16 @@ void QObject::setObjectName(const QStrin { Q_D(QObject); d->objectName = name; @@ -52,7 +52,7 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse Sender *sender); --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h -@@ -655,6 +655,7 @@ public: +@@ -661,6 +661,7 @@ public: static QWidget *keyboardGrabber; void setWindowRole(); @@ -62,7 +62,7 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse void x11UpdateIsOpaque(); --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp -@@ -820,13 +820,17 @@ void QWidgetPrivate::create_sys(WId wind +@@ -825,13 +825,17 @@ void QWidgetPrivate::create_sys(WId wind data.fstrut_dirty = 1; // declare the widget's window role @@ -86,7 +86,7 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse } // set client leader property -@@ -2914,6 +2918,17 @@ void QWidgetPrivate::setWindowRole() +@@ -2919,6 +2923,17 @@ void QWidgetPrivate::setWindowRole() (unsigned char *)windowRole.constData(), windowRole.length()); } diff --git a/debian/patches/0195-compositing-properties.diff b/debian/patches/0195-compositing-properties.diff index 09b2f91..bc4b36e 100644 --- a/debian/patches/0195-compositing-properties.diff +++ b/debian/patches/0195-compositing-properties.diff @@ -13,7 +13,7 @@ bugs.kde.org number : none --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp -@@ -758,6 +758,11 @@ void QWidgetPrivate::create_sys(WId wind +@@ -763,6 +763,11 @@ void QWidgetPrivate::create_sys(WId wind Q_ASSERT(id); XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder, &wsa); @@ -25,7 +25,7 @@ bugs.kde.org number : none } else if (topLevel && !desktop) { // top-level widget if (!X11->wm_client_leader) create_wm_client_leader(); -@@ -811,13 +816,21 @@ void QWidgetPrivate::create_sys(WId wind +@@ -816,13 +821,21 @@ void QWidgetPrivate::create_sys(WId wind // set EWMH window types setNetWmWindowTypes(); @@ -49,7 +49,7 @@ bugs.kde.org number : none // declare the widget's window role QByteArray windowRole; -@@ -837,10 +850,6 @@ void QWidgetPrivate::create_sys(WId wind +@@ -842,10 +855,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); diff --git a/debian/patches/0216-allow-isystem-for-headers.diff b/debian/patches/0216-allow-isystem-for-headers.diff index 2f0c21a..edb1c4b 100644 --- a/debian/patches/0216-allow-isystem-for-headers.diff +++ b/debian/patches/0216-allow-isystem-for-headers.diff @@ -27,7 +27,7 @@ bugs.kde.org number : --- a/configure +++ b/configure -@@ -1022,6 +1022,11 @@ while [ "$#" -gt 0 ]; do +@@ -1012,6 +1012,11 @@ while [ "$#" -gt 0 ]; do VAL=`echo $1 | sed 's,-D,,'` fi ;; @@ -39,7 +39,7 @@ bugs.kde.org number : -I?*|-I) VAR="add_ipath" if [ "$1" = "-I" ]; then -@@ -2030,6 +2035,9 @@ while [ "$#" -gt 0 ]; do +@@ -2020,6 +2025,9 @@ while [ "$#" -gt 0 ]; do add_ipath) I_FLAGS="$I_FLAGS -I\"${VAL}\"" ;; diff --git a/debian/patches/05_append_qt4_target.diff b/debian/patches/05_append_qt4_target.diff index 9c48028..a0dda3d 100644 --- a/debian/patches/05_append_qt4_target.diff +++ b/debian/patches/05_append_qt4_target.diff @@ -57,7 +57,7 @@ author: Fathi Boudra <fabo@debian.org> if [ "$VERBOSE" = "yes" ]; then --- a/configure +++ b/configure -@@ -4258,7 +4258,7 @@ END { +@@ -4262,7 +4262,7 @@ END { } # build qmake @@ -66,7 +66,7 @@ author: Fathi Boudra <fabo@debian.org> echo "Creating qmake. Please wait..." OLD_QCONFIG_H= -@@ -7153,8 +7153,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR +@@ -7157,8 +7157,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 @@ author: Fathi Boudra <fabo@debian.org> QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3 QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp -@@ -7538,11 +7538,11 @@ EXEC="" +@@ -7542,11 +7542,11 @@ EXEC="" #------------------------------------------------------------------------------- echo "Finding project files. Please wait..." @@ -91,7 +91,7 @@ author: Fathi Boudra <fabo@debian.org> fi # .projects -> projects to process -@@ -7717,7 +7717,7 @@ for file in .projects .projects.3; do +@@ -7721,7 +7721,7 @@ for file in .projects .projects.3; do echo " for $a\c" fi diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff index 9305dad..122e0bc 100644 --- a/debian/patches/08_configure_quilt_compat.diff +++ b/debian/patches/08_configure_quilt_compat.diff @@ -3,7 +3,7 @@ It breaks qmake projects search. --- a/configure +++ b/configure -@@ -7594,7 +7594,7 @@ fi +@@ -7598,7 +7598,7 @@ fi # .projects.3 -> the rest rm -f .projects .projects.1 .projects.2 .projects.3 diff --git a/debian/patches/09_qmake_lflags_as-needed.diff b/debian/patches/09_qmake_lflags_as-needed.diff index f945dfd..ae95ca2 100644 --- a/debian/patches/09_qmake_lflags_as-needed.diff +++ b/debian/patches/09_qmake_lflags_as-needed.diff @@ -5,7 +5,7 @@ Bug reported to Trolltech. --- a/configure +++ b/configure -@@ -644,6 +644,8 @@ mkdir -p "$outpath/config.tests" +@@ -634,6 +634,8 @@ mkdir -p "$outpath/config.tests" rm -f "$outpath/config.tests/.qmake.cache" cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" diff --git a/debian/patches/12_add_nostrip_for_debug_packages.diff b/debian/patches/12_add_nostrip_for_debug_packages.diff index be98e1b..09ff450 100644 --- a/debian/patches/12_add_nostrip_for_debug_packages.diff +++ b/debian/patches/12_add_nostrip_for_debug_packages.diff @@ -6,7 +6,7 @@ let dh_strip do it to generate debug packages. --- a/configure +++ b/configure -@@ -645,6 +645,7 @@ rm -f "$outpath/config.tests/.qmake.cach +@@ -635,6 +635,7 @@ rm -f "$outpath/config.tests/.qmake.cach cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" QMakeVar add QMAKE_LFLAGS -Wl,--as-needed diff --git a/debian/patches/30_webkit_unaligned_access.diff b/debian/patches/30_webkit_unaligned_access.diff index e7c5d8b..a8d836f 100644 --- a/debian/patches/30_webkit_unaligned_access.diff +++ b/debian/patches/30_webkit_unaligned_access.diff @@ -64,7 +64,7 @@ a real problem yet. template<typename ValueArg> struct ListHashSetNode { --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h -@@ -376,6 +376,23 @@ +@@ -378,6 +378,23 @@ # include <ce_time.h> #endif |