Re: Bug#749743: qt4-x11: use ppc64el in no_pch_architectures to fix FTBFS on ppc64el
Hi Lisandro,
(Adding William Grant; for the point about 'upstreaming the patch')
On 08/21/2014 10:29 AM, Lisandro Damián Nicanor Pérez Meyer wrote:
Copying ppc64el porters to see if we can speed up this and be able to push qt4
with ppc64el on saturday (hopefully).
Thanks! I believe I can try to help.
I'm attaching a patch that address your points, I believe.
It also handles the symbols files.
With it applied, qt4-x11 builds successfully on ppc64el.
I'll send the build log shortly to BTS [1].
May you please consider/review it for the Saturday upload?
Note: I moved one chunk from ppc64el.patch into the Debian-specific
patch that makes room for it on configure (seemed to be the right place
for that change). If you'd prefer to keep changes only in ppc64el.patch
please apply the attached ...-single-patch.interdiff.
On Sunday 15 June 2014 23:14:37 Lisandro Damián Nicanor Pérez Meyer wrote:
[...]
We have three issues here:
- In the patch [0] *86_64 has been changed to *64 in two lines (in the
middle). I'm really skeptic that this is a good change (if needed at all). And
I need to convince upstream too. Is this really necessary? In case it is, is
there a more precise approach? Like, for example, leaving *86_64 and adding a
new rule for whatever fits ppc64el.
You're right. It's not needed at all. The 'mkspec/qsw/linux-generic-g++'
default seems perfectly fine for ppc64el.
The only difference it has to the previously set 'linux-x86_64-g++'
(heh) is '-m64', which is the default and only-option on ppc64el.
$ diff -U0 mkspecs/qws/linux-{generic,x86_64}-g++
diff -U0 mkspecs/qws/linux-generic-g++/qmake.conf
mkspecs/qws/linux-x86_64-g++/qmake.conf
--- mkspecs/qws/linux-generic-g++/qmake.conf 2014-07-23
17:30:59.000000000 -0300
+++ mkspecs/qws/linux-x86_64-g++/qmake.conf 2014-07-23
17:30:59.000000000 -0300
@@ -2 +2 @@
-# qmake configuration for building with g++
+# qmake configuration for building with linux-g++
@@ -9,0 +10,4 @@
+# modifications to g++.conf
+QMAKE_CFLAGS += -m64
+QMAKE_CXXFLAGS += -m64
+
@@ -10,0 +15 @@
+
- The second issue is: who did this patch? It is not mentioned in the bug and
I need that info to properly add a patch for whatever reason.
It's originally from Ubuntu (details in attached patch's ppc64el.patch).
I included DEP-3 headers in ppc64el.patch for that matter and to explain
the patch's changes.
- The first change in the mentioned patch uses ppc64le and not ppc64el, is
that right?
Yes. On Debian it's 'el' and on GNU et al it's 'le'.
(definitely not the first time this question pops up :-)
dpkg's cputable [2]:
# <Debian name> <GNU name> <config.guess regex> <Bits> <Endianness>
ppc64el powerpc64le powerpc64le 64 little
uname:
$ uname -m
ppc64le
Now, about upstreaming the patch: Qt has a CLA in which you *don't* loose your
copyright but just give permission to Digia to use it in it's commercial
product (the code remains FLOSS!). I have two ways of pushing this upstream:
- Find the original coder and beg him to push it to upstream's gerrit instance
(preferred)
- Find the original coder and beg him to publicly state (on a mailing list,
for example) that this patch is licensed under a BSD license, which is less
restrictive.
>
> We don't want to have deltas, so I *really* need your help here.
William,
AFAICT from Ubuntu's qt4-x11 changelog, you seem to be the patch author.
May you please consider the points above?
Only one chunk seems to be required. The 'PLATFORM=qws/' chunk can be
dropped and the UNAME chunk can be moved to another Debian patch.
@@ -3277,7 +3280,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
fi
CFG_HOST_ARCH=powerpc
;;
- *:*:ppc64)
+ *:*:ppc64*)
if [ "$OPT_VERBOSE" = "yes" ]; then
echo " 64-bit PowerPC (powerpc)"
fi
Note: in this *particular* case I might solve this issue by the fact that this
change really doesn't seems copyrighteable because it's just using already
defined stuff, but if we have either of the above situations things get much
much easier.
Agreed.
[1] http://bugs.debian.org/749743
[2] https://anonscm.debian.org/cgit/dpkg/dpkg.git/tree/cputable
Cheers!
--
Mauricio Faria de Oliveira
IBM Linux Technology Center
diff -u qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/changelog qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/changelog
--- qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/changelog 2014-08-22 12:40:50.000000000 -0300
+++ qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/changelog 2014-08-22 14:55:30.000000000 -0300
@@ -2,7 +2,6 @@
* Add support for ppc64el (Closes: #749743)
- ppc64el.patch: add configure support for ppc64el (thanks Ubuntu; minor changes).
- - 07_trust_dpkg-arch_over_uname-m.diff: likewise.
- add ppc64el to the symbols files.
-- Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com> Fri, 22 Aug 2014 11:11:11 -0300
reverted:
--- qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/patches/07_trust_dpkg-arch_over_uname-m.diff 2014-08-22 12:40:50.000000000 -0300
+++ qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/patches/07_trust_dpkg-arch_over_uname-m.diff 2014-06-26 10:21:22.000000000 -0300
@@ -8,7 +8,7 @@
--- a/configure
+++ b/configure
+@@ -247,7 +247,50 @@ DeviceVar()
-@@ -247,7 +247,53 @@ DeviceVar()
#-------------------------------------------------------------------------------
# need that throughout the script
@@ -51,9 +51,6 @@
+ powerpc)
+ UNAME_MACHINE="ppc"
+ ;;
-+ ppc64el)
-+ UNAME_MACHINE="ppc64le"
-+ ;;
+ *)
+ UNAME_MACHINE="$DPKG_ARCH"
+ ;;
diff -u qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/patches/ppc64el.patch qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/patches/ppc64el.patch
--- qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/patches/ppc64el.patch 2014-08-22 12:44:33.000000000 -0300
+++ qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/patches/ppc64el.patch 2014-08-22 14:56:17.000000000 -0300
@@ -6,9 +6,7 @@
This patch was originally introduced [1] and rebased [2] in Ubuntu Trusty [3].
-Some chunks were changed/removed on Debian:
- - The DPKG_ARCH / UNAME_MACHINE mapping is actually Debian-specific, and done
- in another patch; so this chunk is now there.
+This chunk was removed on Debian:
- The 'PLATFORM=qws/linux-*-g++' setting is not required; ppc64el builds fine
with the default 'linux-generic-g++' (the difference to the previously set
'linux-x86_64-g++' is just '-m64', which is default/only-option on ppc64el).
@@ -20,6 +18,16 @@
diff -pruN a/configure b/configure
--- qt4-x11-4.8.6+dfsg.orig/configure 2014-03-17 13:53:25.000000000 +0000
+++ qt4-x11-4.8.6+dfsg/configure 2014-03-17 13:55:46.000000000 +0000
+@@ -288,6 +288,9 @@ case $DPKG_ARCH in
+ powerpc)
+ UNAME_MACHINE="ppc"
+ ;;
++ ppc64el)
++ UNAME_MACHINE="ppc64le"
++ ;;
+ *)
+ UNAME_MACHINE="$DPKG_ARCH"
+ ;;
@@ -3277,7 +3280,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
fi
CFG_HOST_ARCH=powerpc
diff -Nru qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/changelog qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/changelog
--- qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/changelog 2014-07-25 14:07:51.000000000 -0300
+++ qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/changelog 2014-08-22 12:40:50.000000000 -0300
@@ -1,3 +1,12 @@
+qt4-x11 (4:4.8.6+git49-gbc62005+dfsg-1ppc64el1) UNRELEASED; urgency=medium
+
+ * Add support for ppc64el (Closes: #749743)
+ - ppc64el.patch: add configure support for ppc64el (thanks Ubuntu; minor changes).
+ - 07_trust_dpkg-arch_over_uname-m.diff: likewise.
+ - add ppc64el to the symbols files.
+
+ -- Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com> Fri, 22 Aug 2014 11:11:11 -0300
+
qt4-x11 (4:4.8.6+git49-gbc62005+dfsg-1) unstable; urgency=medium
* New upstream GIT snapshot.
diff -Nru qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqt4-designer.symbols qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqt4-designer.symbols
--- qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqt4-designer.symbols 2014-07-24 23:27:07.000000000 -0300
+++ qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqt4-designer.symbols 2014-08-22 12:40:50.000000000 -0300
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.8.6 alpha amd64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 s390x sparc sparc64
+# SymbolsHelper-Confirmed: 4:4.8.6 alpha amd64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x sparc sparc64
libQtDesigner.so.4 libqt4-designer #MINVER#
* Build-Depends-Package: libqt4-dev
_Z20domPropertyToVariantP20QAbstractFormBuilderPK11QMetaObjectPK11DomProperty@Base 4:4.5.3
@@ -2313,7 +2313,7 @@
(optional=internal|arch=armel powerpcspe)_ZN18qdesigner_internal29PropertySheetKeySequenceValueC2ERKS0_@Base 4:4.8.1
(optional=internal)_ZN18qdesigner_internal29PropertySheetKeySequenceValueD1Ev@Base 4:4.7.4
(optional=internal)_ZN18qdesigner_internal29PropertySheetKeySequenceValueD2Ev@Base 4:4.7.4
- (optional=internal|arch=alpha amd64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 s390x sparc64)_ZN18qdesigner_internal29PropertySheetKeySequenceValueaSERKS0_@Base 4:4.8.4
+ (optional=internal|arch=alpha amd64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x sparc64)_ZN18qdesigner_internal29PropertySheetKeySequenceValueaSERKS0_@Base 4:4.8.4
(optional=internal)_ZN18qdesigner_internal30DeleteStackedWidgetPageCommand4initEP14QStackedWidget@Base 4:4.5.3
(optional=internal)_ZN18qdesigner_internal30DeleteStackedWidgetPageCommand4redoEv@Base 4:4.5.3
(optional=internal)_ZN18qdesigner_internal30DeleteStackedWidgetPageCommand4undoEv@Base 4:4.5.3
@@ -3154,7 +3154,7 @@
_ZN7DomTimeC2Ev@Base 4:4.5.3
_ZN7DomTimeD1Ev@Base 4:4.5.3
_ZN7DomTimeD2Ev@Base 4:4.5.3
- (optional=external|arch=alpha armhf mips mipsel powerpc powerpcspe ppc64 s390x)_ZN7QString5clearEv@Base 4:4.8.1
+ (optional=external|arch=alpha armhf mips mipsel powerpc powerpcspe ppc64 ppc64el s390x)_ZN7QString5clearEv@Base 4:4.8.1
_ZN8DomBrush15setElementColorEP8DomColor@Base 4:4.5.3
_ZN8DomBrush16takeElementColorEv@Base 4:4.5.3
_ZN8DomBrush17setElementTextureEP11DomProperty@Base 4:4.5.3
@@ -4696,8 +4696,8 @@
_ZN19QDesignerComponents20createResourceEditorEP28QDesignerFormEditorInterfaceP7QWidget@Base 4:4.5.3
_ZN19QDesignerComponents21createObjectInspectorEP28QDesignerFormEditorInterfaceP7QWidget@Base 4:4.5.3
_ZN19QDesignerComponents22createSignalSlotEditorEP28QDesignerFormEditorInterfaceP7QWidget@Base 4:4.5.3
- (optional=gccinternal|arch=alpha amd64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 s390x sparc64)_ZN20QStyleOptionViewItemD1Ev@Base 4:4.8.4
- (optional=gccinternal|arch=alpha amd64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 s390x sparc64)_ZN20QStyleOptionViewItemD2Ev@Base 4:4.8.4
+ (optional=gccinternal|arch=alpha amd64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x sparc64)_ZN20QStyleOptionViewItemD1Ev@Base 4:4.8.4
+ (optional=gccinternal|arch=alpha amd64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x sparc64)_ZN20QStyleOptionViewItemD2Ev@Base 4:4.8.4
(optional=gccinternal|arch=sparc)_ZN20QXmlStreamAttributesD1Ev@Base 4:4.8.6
(optional=gccinternal|arch=sparc)_ZN20QXmlStreamAttributesD2Ev@Base 4:4.8.6
(optional=gccinternal|arch=sparc)_ZN22QStyleOptionViewItemV3D1Ev@Base 4:4.8.6
@@ -4713,4 +4713,4 @@
_ZTI22QItemEditorCreatorBase@Base 4:4.5.3
_ZTS22QItemEditorCreatorBase@Base 4:4.5.3
_ZTV22QItemEditorCreatorBase@Base 4:4.5.3
- (optional=external|arch=alpha armhf hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390x)_ZeqRK6QRectFS1_@Base 4:4.8.1
+ (optional=external|arch=alpha armhf hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x)_ZeqRK6QRectFS1_@Base 4:4.8.1
diff -Nru qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqt4-network.symbols qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqt4-network.symbols
--- qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqt4-network.symbols 2014-07-24 23:26:41.000000000 -0300
+++ qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqt4-network.symbols 2014-08-22 12:40:50.000000000 -0300
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.8.6 amd64 kfreebsd-amd64 mipsel powerpc ppc64
+# SymbolsHelper-Confirmed: 4:4.8.6 amd64 kfreebsd-amd64 mipsel powerpc ppc64 ppc64el
libQtNetwork.so.4 libqt4-network #MINVER#
* Build-Depends-Package: libqt4-dev
_Z19qt_qhostinfo_lookupRK7QStringP7QObjectPKcPbPi@Base 4:4.6.3
@@ -752,7 +752,7 @@
_ZN7QSslKeyD1Ev@Base 4:4.5.3
_ZN7QSslKeyD2Ev@Base 4:4.5.3
_ZN7QSslKeyaSERKS_@Base 4:4.5.3
- (arch=alpha armhf mips mipsel ppc64 s390x)_ZN7QString5clearEv@Base 4:4.8.6
+ (arch=alpha armhf mips mipsel ppc64 ppc64el s390x)_ZN7QString5clearEv@Base 4:4.8.6
_ZN8QUrlInfo10setSymLinkEb@Base 4:4.5.3
_ZN8QUrlInfo11greaterThanERKS_S1_i@Base 4:4.5.3
_ZN8QUrlInfo11setLastReadERK9QDateTime@Base 4:4.5.3
diff -Nru qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqt4-qt3support.symbols qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqt4-qt3support.symbols
--- qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqt4-qt3support.symbols 2014-07-24 23:28:40.000000000 -0300
+++ qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqt4-qt3support.symbols 2014-08-22 12:40:50.000000000 -0300
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.8.6 alpha amd64 armel armhf hppa hurd-i386 i386 kfreebsd-i386 mips powerpc ppc64 s390x sparc64
+# SymbolsHelper-Confirmed: 4:4.8.6 alpha amd64 armel armhf hppa hurd-i386 i386 kfreebsd-i386 mips powerpc ppc64 ppc64el s390x sparc64
libQt3Support.so.4 libqt4-qt3support #MINVER#
* Build-Depends-Package: libqt4-dev
_Z16qt_tryAccelEventP7QWidgetP9QKeyEvent@Base 4:4.5.3
@@ -3403,7 +3403,7 @@
_ZN7Q3TableD0Ev@Base 4:4.5.3
_ZN7Q3TableD1Ev@Base 4:4.5.3
_ZN7Q3TableD2Ev@Base 4:4.5.3
- (arch=alpha armel armhf mips mipsel powerpc powerpcspe ppc64 s390x)_ZN7QString5clearEv@Base 4:4.8.6
+ (arch=alpha armel armhf mips mipsel powerpc powerpcspe ppc64 ppc64el s390x)_ZN7QString5clearEv@Base 4:4.8.6
_ZN8Q3Action10removeFromEP7QWidget@Base 4:4.5.3
_ZN8Q3Action10setEnabledEb@Base 4:4.5.3
_ZN8Q3Action10setIconSetERK5QIcon@Base 4:4.5.3
diff -Nru qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqt4-script.symbols qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqt4-script.symbols
--- qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqt4-script.symbols 2014-07-24 23:26:44.000000000 -0300
+++ qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqt4-script.symbols 2014-08-22 12:40:50.000000000 -0300
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.8.6 amd64 kfreebsd-amd64 mipsel powerpc
+# SymbolsHelper-Confirmed: 4:4.8.6 amd64 kfreebsd-amd64 mipsel powerpc ppc64el
libQtScript.so.4 libqt4-script #MINVER#
* Build-Depends-Package: libqt4-dev
_Z14qScriptConnectP7QObjectPKcRK12QScriptValueS5_@Base 4:4.5.3
@@ -282,16 +282,16 @@
_ZN24QScriptSyntaxCheckResultaSERKS_@Base 4:4.5.3
(optional=private|arch=armel hurd-i386 i386 kfreebsd-i386 mipsel powerpc powerpcspe s390 sh4)_ZN25QScriptEngineAgentPrivate11atStatementERKN5QTJSC17DebuggerCallFrameEii@Base 4:4.8.4
(optional=private|subst|arch=!s390)_ZN25QScriptEngineAgentPrivate11atStatementERKN5QTJSC17DebuggerCallFrameE{ssize_t}i@Base 4:4.7.0~beta1
- (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !ppc64 !s390x !sparc64)_ZN25QScriptEngineAgentPrivate11returnEventERKN5QTJSC17DebuggerCallFrameEii@Base 4:4.6.1
- (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 ppc64 s390x sparc64)_ZN25QScriptEngineAgentPrivate11returnEventERKN5QTJSC17DebuggerCallFrameEli@Base 4:4.6.1
- (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !ppc64 !s390x !sparc64)_ZN25QScriptEngineAgentPrivate12evaluateStopERKN5QTJSC7JSValueEi@Base 4:4.6.1
- (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 ppc64 s390x sparc64)_ZN25QScriptEngineAgentPrivate12evaluateStopERKN5QTJSC7JSValueEl@Base 4:4.6.1
- (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !ppc64 !s390x !sparc64)_ZN25QScriptEngineAgentPrivate12functionExitERKN5QTJSC7JSValueEi@Base 4:4.6.1
- (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 ppc64 s390x sparc64)_ZN25QScriptEngineAgentPrivate12functionExitERKN5QTJSC7JSValueEl@Base 4:4.6.1
- (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !ppc64 !s390x !sparc64)_ZN25QScriptEngineAgentPrivate14exceptionCatchERKN5QTJSC17DebuggerCallFrameEi@Base 4:4.6.1
- (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 ppc64 s390x sparc64)_ZN25QScriptEngineAgentPrivate14exceptionCatchERKN5QTJSC17DebuggerCallFrameEl@Base 4:4.6.1
- (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !ppc64 !s390x !sparc64)_ZN25QScriptEngineAgentPrivate14exceptionThrowERKN5QTJSC17DebuggerCallFrameEib@Base 4:4.6.1
- (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 ppc64 s390x sparc64)_ZN25QScriptEngineAgentPrivate14exceptionThrowERKN5QTJSC17DebuggerCallFrameElb@Base 4:4.6.1
+ (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !ppc64 !ppc64el !s390x !sparc64)_ZN25QScriptEngineAgentPrivate11returnEventERKN5QTJSC17DebuggerCallFrameEii@Base 4:4.6.1
+ (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 ppc64 ppc64el s390x sparc64)_ZN25QScriptEngineAgentPrivate11returnEventERKN5QTJSC17DebuggerCallFrameEli@Base 4:4.6.1
+ (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !ppc64 !ppc64el !s390x !sparc64)_ZN25QScriptEngineAgentPrivate12evaluateStopERKN5QTJSC7JSValueEi@Base 4:4.6.1
+ (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 ppc64 ppc64el s390x sparc64)_ZN25QScriptEngineAgentPrivate12evaluateStopERKN5QTJSC7JSValueEl@Base 4:4.6.1
+ (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !ppc64 !ppc64el !ppc64el !s390x !sparc64)_ZN25QScriptEngineAgentPrivate12functionExitERKN5QTJSC7JSValueEi@Base 4:4.6.1
+ (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 ppc64 ppc64el s390x sparc64)_ZN25QScriptEngineAgentPrivate12functionExitERKN5QTJSC7JSValueEl@Base 4:4.6.1
+ (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !ppc64 !ppc64el !s390x !sparc64)_ZN25QScriptEngineAgentPrivate14exceptionCatchERKN5QTJSC17DebuggerCallFrameEi@Base 4:4.6.1
+ (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 ppc64 ppc64el s390x sparc64)_ZN25QScriptEngineAgentPrivate14exceptionCatchERKN5QTJSC17DebuggerCallFrameEl@Base 4:4.6.1
+ (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !ppc64 !ppc64el !s390x !sparc64)_ZN25QScriptEngineAgentPrivate14exceptionThrowERKN5QTJSC17DebuggerCallFrameEib@Base 4:4.6.1
+ (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 ppc64 ppc64el s390x sparc64)_ZN25QScriptEngineAgentPrivate14exceptionThrowERKN5QTJSC17DebuggerCallFrameElb@Base 4:4.6.1
(optional=private|arch=armel hurd-i386 i386 kfreebsd-i386 mipsel powerpc powerpcspe s390 sh4)_ZN25QScriptEngineAgentPrivate18didReachBreakpointERKN5QTJSC17DebuggerCallFrameEii@Base 4:4.8.4
(optional=private|subst|arch=!s390)_ZN25QScriptEngineAgentPrivate18didReachBreakpointERKN5QTJSC17DebuggerCallFrameE{ssize_t}i@Base 4:4.7.0~beta1
(optional=private)_ZN25QScriptEngineAgentPrivate6attachEv@Base 4:4.6.1
diff -Nru qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqtcore4.symbols qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqtcore4.symbols
--- qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqtcore4.symbols 2014-07-24 23:26:13.000000000 -0300
+++ qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqtcore4.symbols 2014-08-22 12:40:50.000000000 -0300
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.8.6 alpha amd64 armel armhf hppa hurd-i386 i386 kfreebsd-i386 mips powerpc ppc64 s390x sparc64
+# SymbolsHelper-Confirmed: 4:4.8.6 alpha amd64 armel armhf hppa hurd-i386 i386 kfreebsd-i386 mips powerpc ppc64 ppc64el s390x sparc64
libQtCLucene.so.4 libqtcore4 #MINVER#
* Build-Depends-Package: libqt4-dev
_ZN12QCLuceneHits2idEi@Base 4:4.5.3
@@ -827,7 +827,7 @@
(arch=hurd-i386 i386 kfreebsd-i386)_Z10qvsnprintfPcjPKcS_@Base 4:4.5.3
(arch=armel armhf)_Z10qvsnprintfPcjPKcSt9__va_list@Base 4:4.8.0
(arch=alpha)_Z10qvsnprintfPcmPKc13__va_list_tag@Base 4:4.5.3
- (arch=ppc64)_Z10qvsnprintfPcmPKcS_@Base 4:4.8.4
+ (arch=ppc64 ppc64el)_Z10qvsnprintfPcmPKcS_@Base 4:4.8.4
(arch=amd64 kfreebsd-amd64 powerpc powerpcspe s390 s390x|subst)_Z10qvsnprintfPc{size_t}PKcP13__va_list_tag@Base 4:4.8.4
(arch=armel armhf hppa ia64 mips mipsel sparc sparc64|subst)_Z10qvsnprintfPc{size_t}PKcPv@Base 4:4.8.4
_Z10scientificR11QTextStream@Base 4:4.5.3
@@ -2999,7 +2999,7 @@
_ZN7QString8truncateEi@Base 4:4.5.3
(arch=alpha sh4)_ZN7QString8vsprintfEPKc13__va_list_tag@Base 4:4.8.5
(arch=amd64 kfreebsd-amd64 powerpc powerpcspe s390 s390x)_ZN7QString8vsprintfEPKcP13__va_list_tag@Base 4:4.8.4
- (arch=hurd-i386 i386 kfreebsd-i386 ppc64)_ZN7QString8vsprintfEPKcPc@Base 4:4.8.4
+ (arch=hurd-i386 i386 kfreebsd-i386 ppc64 ppc64el)_ZN7QString8vsprintfEPKcPc@Base 4:4.8.4
(arch=armel armhf hppa ia64 mips mipsel sparc sparc64)_ZN7QString8vsprintfEPKcPv@Base 4:4.8.4
(arch=armel armhf)_ZN7QString8vsprintfEPKcSt9__va_list@Base 4:4.6.2
_ZN7QString9fromAsciiEPKci@Base 4:4.5.3
diff -Nru qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqtgui4.symbols qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqtgui4.symbols
--- qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqtgui4.symbols 2014-07-24 23:28:24.000000000 -0300
+++ qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/libqtgui4.symbols 2014-08-22 12:40:50.000000000 -0300
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.8.6 alpha amd64 armel armhf hppa hurd-i386 i386 kfreebsd-i386 mips powerpc ppc64 s390x sparc64
+# SymbolsHelper-Confirmed: 4:4.8.6 alpha amd64 armel armhf hppa hurd-i386 i386 kfreebsd-i386 mips powerpc ppc64 ppc64el s390x sparc64
libQtGui.so.4 libqtgui4 #MINVER#
* Build-Depends-Package: libqt4-dev
_Z10qDrawArrowP8QPainterN2Qt9ArrowTypeENS1_8GUIStyleEbiiiiRK8QPaletteb@Base 4:4.5.3
@@ -6137,7 +6137,7 @@
_ZN24QStyleOptionGraphicsItemC1Ev@Base 4:4.5.3
_ZN24QStyleOptionGraphicsItemC2Ei@Base 4:4.5.3
_ZN24QStyleOptionGraphicsItemC2Ev@Base 4:4.5.3
- (arch=alpha)_ZN24QStyleOptionGraphicsItemaSERKS_@Base 4:4.8.6
+ (arch=alpha ppc64el)_ZN24QStyleOptionGraphicsItemaSERKS_@Base 4:4.8.6
_ZN24QStyleOptionQ3DockWindowC1Ei@Base 4:4.5.3
_ZN24QStyleOptionQ3DockWindowC1Ev@Base 4:4.5.3
_ZN24QStyleOptionQ3DockWindowC2Ei@Base 4:4.5.3
@@ -11509,7 +11509,7 @@
_ZNK6QMovie9cacheModeEv@Base 4:4.5.3
_ZNK6QMovie9frameRectEv@Base 4:4.5.3
_ZNK6QMovie9loopCountEv@Base 4:4.5.3
- (optional=external|arch=alpha amd64 armel armhf hppa mipsel ppc64 s390x sparc sparc64)_ZNK6QRectF6toRectEv@Base 4:4.7.2
+ (optional=external|arch=alpha amd64 armel armhf hppa mipsel ppc64 ppc64el s390x sparc sparc64)_ZNK6QRectF6toRectEv@Base 4:4.7.2
_ZNK6QSound10isFinishedEv@Base 4:4.5.3
_ZNK6QSound10metaObjectEv@Base 4:4.5.3
_ZNK6QSound14loopsRemainingEv@Base 4:4.5.3
diff -Nru qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/patches/07_trust_dpkg-arch_over_uname-m.diff qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
--- qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/patches/07_trust_dpkg-arch_over_uname-m.diff 2014-06-26 10:21:22.000000000 -0300
+++ qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/patches/07_trust_dpkg-arch_over_uname-m.diff 2014-08-22 12:40:50.000000000 -0300
@@ -8,7 +8,7 @@
--- a/configure
+++ b/configure
-@@ -247,7 +247,50 @@ DeviceVar()
+@@ -247,7 +247,53 @@ DeviceVar()
#-------------------------------------------------------------------------------
# need that throughout the script
@@ -51,6 +51,9 @@
+ powerpc)
+ UNAME_MACHINE="ppc"
+ ;;
++ ppc64el)
++ UNAME_MACHINE="ppc64le"
++ ;;
+ *)
+ UNAME_MACHINE="$DPKG_ARCH"
+ ;;
diff -Nru qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/patches/ppc64el.patch qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/patches/ppc64el.patch
--- qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/patches/ppc64el.patch 1969-12-31 21:00:00.000000000 -0300
+++ qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/patches/ppc64el.patch 2014-08-22 12:44:33.000000000 -0300
@@ -0,0 +1,31 @@
+Subject: Add configure support for ppc64el
+Origin: vendor, http://launchpadlibrarian.net/159898800/qt4-x11_4:4.8.4+dfsg-0ubuntu20_4:4.8.4+dfsg-0ubuntu21.diff.gz
+Author: William Grant <wgrant@ubuntu.com>
+Author: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
+Last-Update: 2014-08-22
+
+This patch was originally introduced [1] and rebased [2] in Ubuntu Trusty [3].
+
+Some chunks were changed/removed on Debian:
+ - The DPKG_ARCH / UNAME_MACHINE mapping is actually Debian-specific, and done
+ in another patch; so this chunk is now there.
+ - The 'PLATFORM=qws/linux-*-g++' setting is not required; ppc64el builds fine
+ with the default 'linux-generic-g++' (the difference to the previously set
+ 'linux-x86_64-g++' is just '-m64', which is default/only-option on ppc64el).
+
+[1] http://launchpadlibrarian.net/159898800/qt4-x11_4:4.8.4+dfsg-0ubuntu20_4:4.8.4+dfsg-0ubuntu21.diff.gz
+[2] http://launchpadlibrarian.net/162331250/qt4-x11_4:4.8.4+dfsg-0ubuntu22_4:4.8.5+git192-g085f851+dfsg-2ubuntu1.diff.gz
+[3] https://launchpad.net/ubuntu/+source/qt4-x11/+changelog
+
+diff -pruN a/configure b/configure
+--- qt4-x11-4.8.6+dfsg.orig/configure 2014-03-17 13:53:25.000000000 +0000
++++ qt4-x11-4.8.6+dfsg/configure 2014-03-17 13:55:46.000000000 +0000
+@@ -3277,7 +3280,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+ fi
+ CFG_HOST_ARCH=powerpc
+ ;;
+- *:*:ppc64)
++ *:*:ppc64*)
+ if [ "$OPT_VERBOSE" = "yes" ]; then
+ echo " 64-bit PowerPC (powerpc)"
+ fi
diff -Nru qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/patches/series qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/patches/series
--- qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/patches/series 2014-06-15 22:53:44.000000000 -0300
+++ qt4-x11-4.8.6+git49-gbc62005+dfsg/debian/patches/series 2014-08-22 12:44:33.000000000 -0300
@@ -46,3 +46,4 @@
qtdoc-build-offline-docs.patch
remove_addsense.patch
parisc-atomic.patch
+ppc64el.patch
Reply to: