Merge branch 'master' of git+ssh://git.debian.org/git/pkg-kde/qt4-x11

19 files changed, 31 insertions, 56 deletions

diff --git a/debian/libqt4-assistant.symbols b/debian/libqt4-assistant.symbols
index e89f036..b04bbbd 100644
--- a/debian/libqt4-assistant.symbols
+++ b/debian/libqt4-assistant.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.6.1 amd64 i386
 libQtAssistantClient.so.4 libqt4-assistant #MINVER#
+* Build-Depends-Package: libqt4-dev
  _ZGVZ13qvariant_castI8QVariantET_RKS0_E3vid@Base 4:4.6.1
  (arch=armel hppa hurd-i386 sparc)_ZN10QByteArrayD1Ev@Base 4:4.5.3
 #MISSING: 4:4.6.1# _ZN11QStringListD1Ev@Base 4:4.5.3
diff --git a/debian/libqt4-dbus.symbols b/debian/libqt4-dbus.symbols
index 01fb58f..5fdbecb 100644
--- a/debian/libqt4-dbus.symbols
+++ b/debian/libqt4-dbus.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.6.1 amd64 i386
 libQtDBus.so.4 libqt4-dbus #MINVER#
+* Build-Depends-Package: libqt4-dev
  _Z14qDBusReplyFillRK12QDBusMessageR10QDBusErrorR8QVariant@Base 4:4.5.3
  _Z15qDBusAddSpyHookPFvRK12QDBusMessageE@Base 4:4.5.3
  _Z22qDBusBindToApplicationv@Base 4:4.5.3
diff --git a/debian/libqt4-designer.symbols b/debian/libqt4-designer.symbols
index 2296df4..9d62577 100644
--- a/debian/libqt4-designer.symbols
+++ b/debian/libqt4-designer.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.6.1 amd64 i386
 libQtDesigner.so.4 libqt4-designer #MINVER#
+* Build-Depends-Package: libqt4-dev
  _Z20domPropertyToVariantP20QAbstractFormBuilderPK11QMetaObjectPK11DomProperty@Base 4:4.5.3
  _Z20domPropertyToVariantPK11DomProperty@Base 4:4.5.3
  _Z20variantToDomPropertyP20QAbstractFormBuilderPK11QMetaObjectRK7QStringRK8QVariant@Base 4:4.5.3
@@ -4275,6 +4276,7 @@ libQtDesigner.so.4 libqt4-designer #MINVER#
  (c++)"non-virtual thunk to qdesigner_internal::StyleSheetEditorDialog::~StyleSheetEditorDialog()@Base" 4:4.5.3
  (c++)"non-virtual thunk to qdesigner_internal::ZoomProxyWidget::itemChange(QGraphicsItem::GraphicsItemChange, QVariant const&)@Base" 4:4.5.3
 libQtDesignerComponents.so.4 libqt4-designer #MINVER#
+* Build-Depends-Package: libqt4-dev
  (optional=external|arch=armel hppa sparc)_ZN15QBasicAtomicInt3refEv@Base 4:4.5.3
  (optional=external|arch=armel hppa sparc)_ZN15QBasicAtomicInt5derefEv@Base 4:4.5.3
  _ZN19QDesignerComponents14createTaskMenuEP28QDesignerFormEditorInterfaceP7QObject@Base 4:4.5.3
diff --git a/debian/libqt4-help.symbols b/debian/libqt4-help.symbols
index 799fe8f..0a301a8 100644
--- a/debian/libqt4-help.symbols
+++ b/debian/libqt4-help.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.6.1 amd64 i386
 libQtHelp.so.4 libqt4-help #MINVER#
+* Build-Depends-Package: libqt4-dev
  _ZN11QHelpEngine11indexWidgetEv@Base 4:4.5.3
  _ZN11QHelpEngine11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.5.3
  _ZN11QHelpEngine11qt_metacastEPKc@Base 4:4.5.3
diff --git a/debian/libqt4-multimedia.symbols b/debian/libqt4-multimedia.symbols
index 7e3c734..6913253 100644
--- a/debian/libqt4-multimedia.symbols
+++ b/debian/libqt4-multimedia.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.6.1 amd64 i386
 libQtMultimedia.so.4 libqt4-multimedia #MINVER#
+* Build-Depends-Package: libqt4-dev
  _ZN11QAudioInput11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.6.1
  _ZN11QAudioInput11qt_metacastEPKc@Base 4:4.6.1
  _ZN11QAudioInput12stateChangedEN6QAudio5StateE@Base 4:4.6.1
diff --git a/debian/libqt4-network.symbols b/debian/libqt4-network.symbols
index fbeb7b7..564b2ec 100644
--- a/debian/libqt4-network.symbols
+++ b/debian/libqt4-network.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.6.1 amd64 i386
 libQtNetwork.so.4 libqt4-network #MINVER#
+* Build-Depends-Package: libqt4-dev
  _Z5qHashRK12QHostAddress@Base 4:4.5.3
  _Z8qWarningv@Base 4:4.5.3
  _ZN10QByteArray4dataEv@Base 4:4.5.3
diff --git a/debian/libqt4-opengl.symbols b/debian/libqt4-opengl.symbols
index 692a5a4..d2ff3cb 100644
--- a/debian/libqt4-opengl.symbols
+++ b/debian/libqt4-opengl.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.6.1 amd64 i386
 libQtOpenGL.so.4 libqt4-opengl #MINVER#
+* Build-Depends-Package: libqt4-dev
  _Z13qgl_share_regv@Base 4:4.5.3
  _Z18qt_gl_library_namev@Base 4:4.5.3
  _Z19qt_qgl_paint_enginev@Base 4:4.6.1
diff --git a/debian/libqt4-qt3support.symbols b/debian/libqt4-qt3support.symbols
index 1dbd921..7c124de 100644
--- a/debian/libqt4-qt3support.symbols
+++ b/debian/libqt4-qt3support.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.6.1 amd64 i386
 libQt3Support.so.4 libqt4-qt3support #MINVER#
+* Build-Depends-Package: libqt4-dev
  _Z16qt_tryAccelEventP7QWidgetP9QKeyEvent@Base 4:4.5.3
  _Z20qImageFromMimeSourceRK7QString@Base 4:4.5.3
  _Z20qt_tryComposeUnicodeP7QWidgetP9QKeyEvent@Base 4:4.5.3
diff --git a/debian/libqt4-script.symbols b/debian/libqt4-script.symbols
index ad566aa..e51ee0c 100644
--- a/debian/libqt4-script.symbols
+++ b/debian/libqt4-script.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.6.1 amd64 i386
 libQtScript.so.4 libqt4-script #MINVER#
+* Build-Depends-Package: libqt4-dev
  _Z14qScriptConnectP7QObjectPKcRK12QScriptValueS5_@Base 4:4.5.3
 #MISSING: 4:4.6.1# _Z14qt_scriptToXmlRK7QStringi@Base 4:4.5.3
  _Z17qScriptDisconnectP7QObjectPKcRK12QScriptValueS5_@Base 4:4.5.3
diff --git a/debian/libqt4-scripttools.symbols b/debian/libqt4-scripttools.symbols
index 0cea0b4..84e2763 100644
--- a/debian/libqt4-scripttools.symbols
+++ b/debian/libqt4-scripttools.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.6.1 amd64 i386
 libQtScriptTools.so.4 libqt4-scripttools #MINVER#
+* Build-Depends-Package: libqt4-dev
  (optional=external|arch=armel hppa sparc)_ZN15QBasicAtomicInt3refEv@Base 4:4.5.3
  (optional=external|arch=armel hppa sparc)_ZN15QBasicAtomicInt5derefEv@Base 4:4.5.3
  _ZN21QScriptEngineDebugger11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.5.3
diff --git a/debian/libqt4-sql.symbols b/debian/libqt4-sql.symbols
index 0097638..b4f7e68 100644
--- a/debian/libqt4-sql.symbols
+++ b/debian/libqt4-sql.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.6.1 amd64 i386
 libQtSql.so.4 libqt4-sql #MINVER#
+* Build-Depends-Package: libqt4-dev
 #MISSING: 4:4.6.1# _ZN10QByteArray4dataEv@Base 4:4.5.3
  _ZN10QSqlDriver11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.5.3
  _ZN10QSqlDriver11qt_metacastEPKc@Base 4:4.5.3
diff --git a/debian/libqt4-svg.symbols b/debian/libqt4-svg.symbols
index 0782e65..0b511f2 100644
--- a/debian/libqt4-svg.symbols
+++ b/debian/libqt4-svg.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.6.1 amd64 i386
 libQtSvg.so.4 libqt4-svg #MINVER#
+* Build-Depends-Package: libqt4-dev
  _ZN10QSvgWidget10paintEventEP11QPaintEvent@Base 4:4.5.3
  _ZN10QSvgWidget11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.5.3
  _ZN10QSvgWidget11qt_metacastEPKc@Base 4:4.5.3
diff --git a/debian/libqt4-test.symbols b/debian/libqt4-test.symbols
index bbde485..1a10d1f 100644
--- a/debian/libqt4-test.symbols
+++ b/debian/libqt4-test.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.6.1 amd64 i386
 libQtTest.so.4 libqt4-test #MINVER#
+* Build-Depends-Package: libqt4-dev
  _ZGVZN14QTestEventLoop8instanceEvE8testLoop@Base 4:4.5.3
  _ZN14QTestEventLoop11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.5.3
  _ZN14QTestEventLoop11qt_metacastEPKc@Base 4:4.5.3
diff --git a/debian/libqt4-webkit.symbols b/debian/libqt4-webkit.symbols
index ac900bb..e5ca12b 100644
--- a/debian/libqt4-webkit.symbols
+++ b/debian/libqt4-webkit.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.6.1 amd64 i386
 libQtWebKit.so.4 libqt4-webkit #MINVER#
+* Build-Depends-Package: libqt4-dev
  JSCheckScriptSyntax@Base 4:4.5.3
  JSClassCreate@Base 4:4.5.3
  JSClassRelease@Base 4:4.5.3
diff --git a/debian/libqt4-xml.symbols b/debian/libqt4-xml.symbols
index 7c06387..e7a47d7 100644
--- a/debian/libqt4-xml.symbols
+++ b/debian/libqt4-xml.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.6.1 amd64 i386
 libQtXml.so.4 libqt4-xml #MINVER#
+* Build-Depends-Package: libqt4-dev
 #MISSING: 4:4.6.1# _ZN10QByteArray4dataEv@Base 4:4.5.3
  _ZN10QDomEntityC1EP17QDomEntityPrivate@Base 4:4.5.3
  _ZN10QDomEntityC1ERKS_@Base 4:4.5.3
diff --git a/debian/libqt4-xmlpatterns.symbols b/debian/libqt4-xmlpatterns.symbols
index 1a7df25..58a911d 100644
--- a/debian/libqt4-xmlpatterns.symbols
+++ b/debian/libqt4-xmlpatterns.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.6.1 amd64 i386
 libQtXmlPatterns.so.4 libqt4-xmlpatterns #MINVER#
+* Build-Depends-Package: libqt4-dev
  _Z5qHashRK15QSourceLocation@Base 4:4.5.3
  _Z5qHashRK18QXmlNodeModelIndex@Base 4:4.5.3
  _Z5qHashRK8QXmlName@Base 4:4.5.3
diff --git a/debian/libqtcore4.symbols b/debian/libqtcore4.symbols
index 01e863a..034657b 100644
--- a/debian/libqtcore4.symbols
+++ b/debian/libqtcore4.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.6.1 amd64 hurd-i386 i386
 libQtCLucene.so.4 libqtcore4 #MINVER#
+* Build-Depends-Package: libqt4-dev
  _ZN12QCLuceneHits2idEi@Base 4:4.5.3
  _ZN12QCLuceneHits5scoreEi@Base 4:4.5.3
  _ZN12QCLuceneHits8documentEi@Base 4:4.5.3
@@ -756,6 +757,7 @@ libQtCLucene.so.4 libqtcore4 #MINVER#
  _ZTV29QCLuceneMultiFieldQueryParser@Base 4:4.5.3
  _ZTV31QCLucenePerFieldAnalyzerWrapper@Base 4:4.5.3
 libQtCore.so.4 libqtcore4 #MINVER#
+* Build-Depends-Package: libqt4-dev
  _Z10forcepointR11QTextStream@Base 4:4.5.3
  _Z10noshowbaseR11QTextStream@Base 4:4.5.3
  _Z10qAllocMoreii@Base 4:4.5.3
diff --git a/debian/libqtgui4.symbols b/debian/libqtgui4.symbols
index 02897c8..7c500df 100644
--- a/debian/libqtgui4.symbols
+++ b/debian/libqtgui4.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 4:4.6.1 amd64 i386
 libQtGui.so.4 libqtgui4 #MINVER#
+* Build-Depends-Package: libqt4-dev
  _Z10qDrawArrowP8QPainterN2Qt9ArrowTypeENS1_8GUIStyleEbiiiiRK8QPaletteb@Base 4:4.5.3
  (optional=templinst)_Z10qt_memfillIjEvPT_S0_i@Base 4:4.6.1
  _Z10qt_x11InfoPK12QPaintDevice@Base 4:4.5.3
diff --git a/debian/patches/92_armel_gcc43_valist_compat.diff b/debian/patches/92_armel_gcc43_valist_compat.diff
index 1db7aa3..e690d5c 100644
--- a/debian/patches/92_armel_gcc43_valist_compat.diff
+++ b/debian/patches/92_armel_gcc43_valist_compat.diff
@@ -8,80 +8,35 @@ Subject: Restore QtCore ABI compatibility with binaries built with g++ 4.3 on ar
    qvsnprintf(char *str, size_t n, const char *fmt, va_list ap);
    QString &QString::vsprintf(const char* cformat, va_list ap);
  .
- The patch uses overloading feature of the C++ language to add aliases for the
- symbols above. Those aliases are mangled under g++ 4.4 in the same way as
- original symbols are under g++ 4.3 and below.
+ The patch uses .symver assembler directive to add aliases for the symbols
+ above. Those aliases are mangled in the same way as g++ 4.3 would mangle
+ original symbols.
 Forward: not-needed
 
---- a/src/corelib/tools/qbytearray.h
-+++ b/src/corelib/tools/qbytearray.h
-@@ -52,6 +52,10 @@
- #error qbytearray.h must be included before any header file that defines truncate
- #endif
- 
-+// Workaround type safety when casting to va_list.
-+#define DEBIAN_CAST_TO_VA_LIST(list, type) \
-+    (*reinterpret_cast<va_list*>(reinterpret_cast<type*>(&list)))
-+
- QT_BEGIN_HEADER
- 
- QT_BEGIN_NAMESPACE
-@@ -96,6 +100,11 @@ Q_CORE_EXPORT int qstrnicmp(const char *
- 
- // implemented in qvsnprintf.cpp
- Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap);
-+#if defined __ARM_EABI__ && defined __GNUC__ && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-+    // va_list mangling has been changed in g++ 4.4 on armel. Add binary
-+    // compatibility hack for g++ 4.3 and below.
-+    Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, void* ap);
-+#endif
- Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...);
- 
- #ifdef QT3_SUPPORT
 --- a/src/corelib/tools/qstring.cpp
 +++ b/src/corelib/tools/qstring.cpp
-@@ -5289,6 +5289,12 @@ QString &QString::vsprintf(const char* c
+@@ -5289,6 +5289,11 @@
      return *this;
  }
  
++// va_list mangling has been changed in g++ 4.4
++// Add ABI compatibility hack for g++ 4.3 and below.
 +#if defined __ARM_EABI__ && defined __GNUC__ && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-+QString &QString::vsprintf(const char* cformat, void* ap)
-+{
-+    return vsprintf(cformat, DEBIAN_CAST_TO_VA_LIST(ap, void*));
-+}
++__asm__(".symver _ZN7QString8vsprintfEPKcSt9__va_list, _ZN7QString8vsprintfEPKcPv@@");
 +#endif
  /*!
      Returns the string converted to a \c{long long} using base \a
      base, which is 10 by default and must be between 2 and 36, or 0.
---- a/src/corelib/tools/qstring.h
-+++ b/src/corelib/tools/qstring.h
-@@ -177,6 +177,15 @@ public:
-         __attribute__ ((format (printf, 2, 0)))
- #endif
-         ;
-+    // va_list mangling has been changed in g++ 4.4 on armel. Add binary
-+    // compatibility hack for g++ 4.3 and below.
-+#if defined __ARM_EABI__ && defined __GNUC__ && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-+    QString    &vsprintf(const char *format, void* ap)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+        __attribute__ ((format (printf, 2, 0)))
-+#endif
-+        ;
-+#endif
-     QString    &sprintf(const char *format, ...)
- #if defined(Q_CC_GNU) && !defined(__INSURE__)
-         __attribute__ ((format (printf, 2, 3)))
 --- a/src/corelib/tools/qvsnprintf.cpp
 +++ b/src/corelib/tools/qvsnprintf.cpp
-@@ -104,6 +104,13 @@ int qvsnprintf(char *str, size_t n, cons
+@@ -104,6 +104,12 @@
  
  #endif
  
++// va_list mangling has been changed in g++ 4.4
++// Add ABI compatibility hack for g++ 4.3 and below.
 +#if defined __ARM_EABI__ && defined __GNUC__ && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-+int qvsnprintf(char *str, size_t n, const char *fmt, void* ap)
-+{
-+    return qvsnprintf(str, n, fmt, DEBIAN_CAST_TO_VA_LIST(ap, void*));
-+}
++__asm__(".symver _Z10qvsnprintfPcjPKcSt9__va_list, _Z10qvsnprintfPcjPKcPv@@");
 +#endif
 +
  /*!