[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

Fathi Boudra fabo at alioth.debian.org
Sat Jun 11 11:42:40 UTC 2011


The following commit has been merged in the experimental-snapshots branch:
commit 576fbcd5644c3469e552a05c3a362b1bab5d6ccd
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Dec 5 00:11:36 2010 +0200

    Drop a couple of patches as recommended by Thiago and Jonathan.
    
    See [1] for further reference. Patches dropped by this commit:
    
    - 0180-window-role.diff - rejected by upstream, unnecessary KDE apps have
      names already;
    - 0209-prevent-qt-mixing.diff - should be dropped;
    - 0216-allow-isystem-for-headers.diff - mac only skip it;
    
    [1] http://lists.alioth.debian.org/pipermail/pkg-kde-talk/2010-November/001555.html
---
 debian/changelog                                   |    5 +
 debian/patches/0180-window-role.diff               |  106 --------------------
 debian/patches/0209-prevent-qt-mixing.diff         |   32 ------
 debian/patches/0216-allow-isystem-for-headers.diff |   51 ----------
 debian/patches/series                              |    3 -
 5 files changed, 5 insertions(+), 192 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b3e480..aeb26c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,11 @@ qt4-x11 (4:4.7.1-0r1) UNRELEASED; urgency=low
   * Confirm symbol files for 4.7.0~rc1 on alpha armel hurd-i386 i386 ia64
     kfreebsd-amd64 kfreebsd-i386 mipsel powerpc sparc (based on experimental
     build logs).
+  * Drop a couple of patches as recommended by Thiago and Jonathan:
+    - 0180-window-role.diff - rejected by upstream, unnecessary KDE apps have
+      names already;
+    - 0209-prevent-qt-mixing.diff - should be dropped;
+    - 0216-allow-isystem-for-headers.diff - mac only skip it;
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 06 Oct 2010 14:55:15 +0200
 
diff --git a/debian/patches/0180-window-role.diff b/debian/patches/0180-window-role.diff
deleted file mode 100644
index 580dc27..0000000
--- a/debian/patches/0180-window-role.diff
+++ /dev/null
@@ -1,106 +0,0 @@
-From b48e2091871516496cf0b133249fbf5326a55831 Mon Sep 17 00:00:00 2001
-From: Lubos Lunak <l.lunak at kde.org>
-Date: Sat, 23 Feb 2008 16:44:52 +0100
-Subject: [PATCH 01/16] This patch uses object name as a fallback for window role if no window
- role is set explicitly using setWindowRole(). Since Qt3 always used
- the object name as the window role and most Qt3/KDE3 code is ported to
- call setObjectName(),
-
-this makes the window role set in many cases (which KWin uses for window identifying).
-
-NOTE: It is suggested to apply patch #0209 as well when this patch is used.
-
-qt-bugs@ issue : 167704
-Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refused)
----
- src/corelib/kernel/qobject.cpp |    8 ++++++++
- src/corelib/kernel/qobject_p.h |    3 +++
- src/gui/kernel/qwidget_p.h     |    1 +
- src/gui/kernel/qwidget_x11.cpp |   27 +++++++++++++++++++++------
- 4 files changed, 33 insertions(+), 6 deletions(-)
-
---- a/src/corelib/kernel/qobject.cpp
-+++ b/src/corelib/kernel/qobject.cpp
-@@ -1095,8 +1095,16 @@ void QObject::setObjectName(const QStrin
- {
-     Q_D(QObject);
-     d->objectName = name;
-+#if defined(Q_WS_X11)
-+    d->checkWindowRole();
-+#endif
- }
- 
-+#if defined(Q_WS_X11)
-+void QObjectPrivate::checkWindowRole()
-+{
-+}
-+#endif
- 
- #ifdef QT3_SUPPORT
- /*! \internal
---- a/src/corelib/kernel/qobject_p.h
-+++ b/src/corelib/kernel/qobject_p.h
-@@ -155,6 +155,9 @@ public:
-     void sendPendingChildInsertedEvents();
-     void removePendingChildInsertedEvents(QObject *child);
- #endif
-+#if defined(Q_WS_X11)
-+    virtual void checkWindowRole();
-+#endif
- 
-     static inline Sender *setCurrentSender(QObject *receiver,
-                                     Sender *sender);
---- a/src/gui/kernel/qwidget_p.h
-+++ b/src/gui/kernel/qwidget_p.h
-@@ -757,6 +757,7 @@ public:
-     static QWidget *keyboardGrabber;
- 
-     void setWindowRole();
-+    virtual void checkWindowRole();
-     void sendStartupMessage(const char *message) const;
-     void setNetWmWindowTypes();
-     void x11UpdateIsOpaque();
---- a/src/gui/kernel/qwidget_x11.cpp
-+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -824,13 +824,17 @@ void QWidgetPrivate::create_sys(WId wind
-         data.fstrut_dirty = 1;
- 
-         // declare the widget's window role
-+        QByteArray windowRole;
-         if (QTLWExtra *topData = maybeTopData()) {
--            if (!topData->role.isEmpty()) {
--                QByteArray windowRole = topData->role.toUtf8();
--                XChangeProperty(dpy, id,
--                                ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
--                                (unsigned char *)windowRole.constData(), windowRole.length());
--            }
-+            if (!topData->role.isEmpty())
-+                windowRole = topData->role.toUtf8();
-+        }
-+        if (windowRole.isEmpty()) // use object name as a fallback
-+            windowRole = objectName.toUtf8();
-+        if (!windowRole.isEmpty()) {
-+            XChangeProperty(dpy, id,
-+                            ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
-+                            (unsigned char *)windowRole.constData(), windowRole.length());
-         }
- 
-         // set client leader property
-@@ -2941,6 +2945,17 @@ void QWidgetPrivate::setWindowRole()
-     XChangeProperty(X11->display, q->internalWinId(),
-                     ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
-                     (unsigned char *)windowRole.constData(), windowRole.length());
-+}
-+
-+void QWidgetPrivate::checkWindowRole()
-+{
-+    Q_Q(QWidget);
-+    if( !q->windowRole().isEmpty() || !q->internalWinId())
-+        return;
-+    QByteArray windowRole = objectName.toUtf8(); // use as a fallback
-+    XChangeProperty(X11->display, q->internalWinId(),
-+                    ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
-+                    (unsigned char *)windowRole.constData(), windowRole.length());
- }
- 
- Q_GLOBAL_STATIC(QX11PaintEngine, qt_widget_paintengine)
diff --git a/debian/patches/0209-prevent-qt-mixing.diff b/debian/patches/0209-prevent-qt-mixing.diff
deleted file mode 100644
index 06df477..0000000
--- a/debian/patches/0209-prevent-qt-mixing.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-From 68eaa07de69e873b89d4aba341c6ed1ca81f6819 Mon Sep 17 00:00:00 2001
-From: Lubos Lunak <l.lunak at kde.org>
-Date: Wed, 30 Jan 2008 14:24:01 +0100
-Subject: [PATCH 03/16] This patch changes QObjectPrivateVersion, thus preventing mixing
- parts of upstream Qt and qt-copy. In general it is a bad idea to mix
- e.g. libQtCore from one build and libQtGui from another one, and other
- qt-copy patches could make changes in Qt internal structures that could
- cause problems when mixed with upstream Qt.
-
-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.
-
-qt-bugs@ issue : none
-Trolltech task ID : none
-bugs.kde.org number : none
----
- src/corelib/kernel/qobject_p.h |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
---- a/src/corelib/kernel/qobject_p.h
-+++ b/src/corelib/kernel/qobject_p.h
-@@ -82,7 +82,9 @@ void Q_CORE_EXPORT qt_register_signal_sp
- 
- extern QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set;
- 
--enum { QObjectPrivateVersion = QT_VERSION };
-+// add 0x1000000 to mark it as qt-copy version, with possible modifications
-+// in some Q*Private class
-+enum { QObjectPrivateVersion = QT_VERSION + 0x1000000 };
- 
- class Q_CORE_EXPORT QAbstractDeclarativeData
- {
diff --git a/debian/patches/0216-allow-isystem-for-headers.diff b/debian/patches/0216-allow-isystem-for-headers.diff
deleted file mode 100644
index 5e72e48..0000000
--- a/debian/patches/0216-allow-isystem-for-headers.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-From 86fc0d43cdcf3232ae0e4e6f4f28cf8f1a45ede5 Mon Sep 17 00:00:00 2001
-From: Benjamin Reed <rangerrick at befunk.com>
-Date: Tue, 19 Feb 2008 17:37:37 +0100
-Subject: [PATCH 04/16] This patch adds support for using -isystem to allow putting an include
- directory at the end of the compiler's header search path.
-
-I don't have the exact output anymore (I've since patched Qt's configure) but
-essentially, since I have pcre.h in /opt/kde4-deps/include, it was
-conflicting with Qt's (modified) pcre.h in the WebKit bits, since
--I /opt/kde4-deps/include ends up in CXXFLAGS in the generated makefiles, it
-comes *before* the specific locations in INCPATH on the compile line, and you
-end up with a conflict with the system-installed pcre.h.
-
-Presumably, if your pcre.h is in /usr/include as on most Linux systems, you
-wouldn't notice this issue since /usr/include's already in your include path
-and people likely don't pass -I /usr/include to configure.  I suspect that on
-any platform with a regular, system-installed pcre.h (or clucene headers),
-adding -I /usr/include would exhibit this bug, just as a custom-installed
-pcre/clucene in another root would.
-
-qt-bugs@ issue : 199610
-Trolltech task ID :
-bugs.kde.org number :
----
- configure |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
---- a/configure
-+++ b/configure
-@@ -1058,6 +1058,11 @@ while [ "$#" -gt 0 ]; do
-             VAL=`echo $1 | sed 's,-D,,'`
-         fi
-         ;;
-+    -isystem)
-+        VAR="add_isystempath"
-+        shift
-+        VAL="$1"
-+        ;;
-     -I?*|-I)
-         VAR="add_ipath"
-         if [ "$1" = "-I" ]; then
-@@ -2182,6 +2187,9 @@ while [ "$#" -gt 0 ]; do
-     add_ipath)
-         I_FLAGS="$I_FLAGS -I\"${VAL}\""
-         ;;
-+    add_isystempath)
-+        I_FLAGS="$I_FLAGS -isystem \"${VAL}\""
-+        ;;
-     add_lpath)
-         L_FLAGS="$L_FLAGS -L\"${VAL}\""
-         ;;
diff --git a/debian/patches/series b/debian/patches/series
index 1caeb15..1c2bfbc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,5 @@
 # qt-copy patches
-0180-window-role.diff
 0195-compositing-properties.diff
-0209-prevent-qt-mixing.diff
-0216-allow-isystem-for-headers.diff
 0225-invalidate-tabbar-geometry-on-refresh.patch
 
 # debian patches

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list