Merge lp:~timo-jyrinki/ubuntu/trusty/telepathy-qt5/fix_qt52_build into lp:ubuntu/trusty/telepathy-qt5

[Timo Jyrinki]

debian/patches/05-fix-qt52-build.patch: build against both
Qt 5.0 and 5.2 (thanks to Albert) (LP: #1267835)

Qt 5.0 build tested locally, Qt 5.2 build at https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-daily/+sourcepub/3830635/+listing-archive-extra

Symbols updated for i386, amd64 and armhf from earlier LP build logs.

Update: Qt 5.0 PPA build: https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-proper/+sourcepub/3835645/+listing-archive-extra

[Dmitry Shachnev (mitya57)]

Thanks. I took the liberty to add a changelog entry for symbols update and some headers to the patch, and uploaded. Built on all archs now.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-08 22:02:16 +0000
+++ debian/changelog	2014-01-20 04:58:34 +0000
@@ -1,3 +1,10 @@
+telepathy-qt5 (0.9.3-0ubuntu6) UNRELEASED; urgency=medium
+
+  * debian/patches/05-fix-qt52-build.patch: build against both 
+    Qt 5.0 and 5.2 (thanks to Albert) (LP: #1267835)
+
+ -- Timo Jyrinki <[e-mail]>  Fri, 17 Jan 2014 10:22:42 +0200
+
 telepathy-qt5 (0.9.3-0ubuntu5) saucy; urgency=low
 
   * debian/libtelepathy-qt5-dev.install: should also install

=== modified file 'debian/libtelepathy-qt5-0.symbols'
--- debian/libtelepathy-qt5-0.symbols	2013-06-08 12:42:10 +0000
+++ debian/libtelepathy-qt5-0.symbols	2014-01-20 04:58:34 +0000
@@ -477,14 +477,14 @@
  _ZN2Tp14SimpleObserverD0Ev@Base 0.9.3
  _ZN2Tp14SimpleObserverD1Ev@Base 0.9.3
  _ZN2Tp14SimpleObserverD2Ev@Base 0.9.3
- _ZN2Tp14SimplePresenceC1ERKS0_@Base 0.9.3
- _ZN2Tp14SimplePresenceC2ERKS0_@Base 0.9.3
+ (arch=powerpc)_ZN2Tp14SimplePresenceC1ERKS0_@Base 0.9.3
+ (arch=powerpc)_ZN2Tp14SimplePresenceC2ERKS0_@Base 0.9.3
  _ZN2Tp14SimplePresenceD1Ev@Base 0.9.3
  _ZN2Tp14SimplePresenceD2Ev@Base 0.9.3
  _ZN2Tp14enableWarningsEb@Base 0.9.3
  _ZN2Tp14enabledWarningEv@Base 0.9.3
- _ZN2Tp15CallStateReasonC1ERKS0_@Base 0.9.3
- _ZN2Tp15CallStateReasonC2ERKS0_@Base 0.9.3
+ (arch=!armhf)_ZN2Tp15CallStateReasonC1ERKS0_@Base 0.9.3
+ (arch=!armhf)_ZN2Tp15CallStateReasonC2ERKS0_@Base 0.9.3
  _ZN2Tp15CallStateReasonD1Ev@Base 0.9.3
  _ZN2Tp15CallStateReasonD2Ev@Base 0.9.3
  _ZN2Tp15ClientRegistrar11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.9.3
@@ -1256,8 +1256,8 @@
  _ZN2Tp27IncomingFileTransferChannelD2Ev@Base 0.9.3
  _ZN2Tp27MediaStreamHandlerCandidateD1Ev@Base 0.9.3
  _ZN2Tp27MediaStreamHandlerCandidateD2Ev@Base 0.9.3
- (arch=armhf powerpc)_ZN2Tp27MediaStreamHandlerTransportC1ERKS0_@Base 0.9.3
- (arch=armhf powerpc)_ZN2Tp27MediaStreamHandlerTransportC2ERKS0_@Base 0.9.3
+ (arch=powerpc)_ZN2Tp27MediaStreamHandlerTransportC1ERKS0_@Base 0.9.3
+ (arch=powerpc)_ZN2Tp27MediaStreamHandlerTransportC2ERKS0_@Base 0.9.3
  _ZN2Tp27MediaStreamHandlerTransportD1Ev@Base 0.9.3
  _ZN2Tp27MediaStreamHandlerTransportD2Ev@Base 0.9.3
  _ZN2Tp27OutgoingFileTransferChannel11FeatureCoreE@Base 0.9.3
@@ -1349,8 +1349,6 @@
  (optional=templinst)_ZN2Tp5DebuglsINS_8FeaturesEEERS0_T_@Base 0.9.3
  (optional=templinst)_ZN2Tp5DebuglsIPKNS_7ContactEEERS0_T_@Base 0.9.3
  (optional=templinst|arch=!armhf !powerpc)_ZN2Tp5DebuglsIPNS_7ContactEEERS0_T_@Base 0.9.3
- (arch=!armhf !powerpc)_ZN2Tp6AvatarC1ERKS0_@Base 0.9.3
- (arch=!armhf !powerpc)_ZN2Tp6AvatarC2ERKS0_@Base 0.9.3
  _ZN2Tp6AvatarD1Ev@Base 0.9.3
  _ZN2Tp6AvatarD2Ev@Base 0.9.3
  _ZN2Tp6Client14DebugInterface10invalidateEPNS_9DBusProxyERK7QStringS6_@Base 0.9.3
@@ -4413,12 +4411,12 @@
  _ZNK2Tp9DBusProxy19invalidationMessageEv@Base 0.9.3
  _ZNK2Tp9DBusProxy7busNameEv@Base 0.9.3
  _ZNK2Tp9DBusProxy7isValidEv@Base 0.9.3
- _ZTI14QXmlDTDHandler@Base 0.9.3
- _ZTI15QXmlDeclHandler@Base 0.9.3
- _ZTI16QXmlErrorHandler@Base 0.9.3
- _ZTI18QXmlContentHandler@Base 0.9.3
- _ZTI18QXmlEntityResolver@Base 0.9.3
- _ZTI18QXmlLexicalHandler@Base 0.9.3
+ (arch=powerpc)_ZTI14QXmlDTDHandler@Base 0.9.3
+ (arch=powerpc)_ZTI15QXmlDeclHandler@Base 0.9.3
+ (arch=powerpc)_ZTI16QXmlErrorHandler@Base 0.9.3
+ (arch=powerpc)_ZTI18QXmlContentHandler@Base 0.9.3
+ (arch=powerpc)_ZTI18QXmlEntityResolver@Base 0.9.3
+ (arch=powerpc)_ZTI18QXmlLexicalHandler@Base 0.9.3
  _ZTIN2Tp10AccountSetE@Base 0.9.3
  _ZTIN2Tp10CallStreamE@Base 0.9.3
  _ZTIN2Tp10ConnectionE@Base 0.9.3
@@ -4618,12 +4616,12 @@
  _ZTIN2Tp7ContactE@Base 0.9.3
  _ZTIN2Tp7ProfileE@Base 0.9.3
  _ZTIN2Tp9DBusProxyE@Base 0.9.3
- _ZTS14QXmlDTDHandler@Base 0.9.3
- _ZTS15QXmlDeclHandler@Base 0.9.3
- _ZTS16QXmlErrorHandler@Base 0.9.3
- _ZTS18QXmlContentHandler@Base 0.9.3
- _ZTS18QXmlEntityResolver@Base 0.9.3
- _ZTS18QXmlLexicalHandler@Base 0.9.3
+ (arch=powerpc)_ZTS14QXmlDTDHandler@Base 0.9.3
+ (arch=powerpc)_ZTS15QXmlDeclHandler@Base 0.9.3
+ (arch=powerpc)_ZTS16QXmlErrorHandler@Base 0.9.3
+ (arch=powerpc)_ZTS18QXmlContentHandler@Base 0.9.3
+ (arch=powerpc)_ZTS18QXmlEntityResolver@Base 0.9.3
+ (arch=powerpc)_ZTS18QXmlLexicalHandler@Base 0.9.3
  _ZTSN2Tp10AccountSetE@Base 0.9.3
  _ZTSN2Tp10CallStreamE@Base 0.9.3
  _ZTSN2Tp10ConnectionE@Base 0.9.3
@@ -4826,12 +4824,12 @@
  _ZTTN2Tp21AbstractClientHandlerE@Base 0.9.3
  _ZTTN2Tp22AbstractClientApproverE@Base 0.9.3
  _ZTTN2Tp22AbstractClientObserverE@Base 0.9.3
- _ZTV14QXmlDTDHandler@Base 0.9.3
- _ZTV15QXmlDeclHandler@Base 0.9.3
- _ZTV16QXmlErrorHandler@Base 0.9.3
- _ZTV18QXmlContentHandler@Base 0.9.3
- _ZTV18QXmlEntityResolver@Base 0.9.3
- _ZTV18QXmlLexicalHandler@Base 0.9.3
+ (arch=powerpc)_ZTV14QXmlDTDHandler@Base 0.9.3
+ (arch=powerpc)_ZTV15QXmlDeclHandler@Base 0.9.3
+ (arch=powerpc)_ZTV16QXmlErrorHandler@Base 0.9.3
+ (arch=powerpc)_ZTV18QXmlContentHandler@Base 0.9.3
+ (arch=powerpc)_ZTV18QXmlEntityResolver@Base 0.9.3
+ (arch=powerpc)_ZTV18QXmlLexicalHandler@Base 0.9.3
  _ZTVN2Tp10AccountSetE@Base 0.9.3
  _ZTVN2Tp10CallStreamE@Base 0.9.3
  _ZTVN2Tp10ConnectionE@Base 0.9.3

=== added file 'debian/patches/05-fix-qt52-build.patch'
--- debian/patches/05-fix-qt52-build.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/05-fix-qt52-build.patch	2014-01-20 04:58:34 +0000
@@ -0,0 +1,13 @@
+=== modified file 'cmake/modules/TpQtMacros.cmake'
+--- a/cmake/modules/TpQtMacros.cmake	2013-06-06 04:56:14 +0000
++++ b/cmake/modules/TpQtMacros.cmake	2014-01-17 08:04:53 +0000
+@@ -178,7 +178,7 @@
+ function(TPQT_GENERATE_MOC_I infile outfile)
+     qt5_get_moc_flags(moc_flags)
+     get_filename_component(abs_infile ${infile} ABSOLUTE)
+-    qt5_create_moc_command(${abs_infile} ${outfile} "${moc_flags}" "-i")
++    qt5_create_moc_command(${abs_infile} ${outfile} "${moc_flags}" "-i" "")
+     set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC TRUE)  # dont run automoc on this file
+ endfunction(TPQT_GENERATE_MOC_I)
+ 
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-06-06 04:56:14 +0000
+++ debian/patches/series	2014-01-20 04:58:34 +0000
@@ -2,3 +2,4 @@
 02-adapt_to_work_with_q5_final.patch
 03-add_service_side_classes.patch
 04-force_PIC_QT5.patch
+05-fix-qt52-build.patch