trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: August 2012

Re: [trinity-devel] 3.5.13-sru avahi-tqt (patch) - just need to pick commit and backport

From: Slávek Banko <slavek.banko@...>
Date: Wed, 22 Aug 2012 17:03:15 +0200
Dne út 14. srpna 2012 David C. Rankin napsal(a):
> Sorry Slavek. What I did to create the patch was to look at
>
> http://trinity-devel.pearsoncomputing.net/?0::6608
>
> tqt-interface in 3513-sru need exactly what I hand in the attached diff
> to the original message:
>
>  qt-watch.moc3: qt-watch.cpp
> -       $(AM_V_GEN)$(MOC_QT3) moc $^ $@
> +       $(AM_V_GEN)$(MOC_QT3) $^ -o $@
>
> There should be _no_ tqmoc change. If I overlooked that in the commit
> 8f7a6ec9f95f then we can NOT use that commit. We may need a new one.
> Removing the 'moc' is fine as the makefile magic takes care of that.
> Without this patch, avahi-tqt will not build. Let me know if that makes
> sense.

David,

I still have doubts about the patch. Reasons I got:
1) In the GIT never been such a form.
2) Other distributions not reported this problem.
3) The patch removes the command and leaves orphaned parameters.
4) When I tried to add it, on Debian/Ubuntu occurred FTBFS.

I can not help but still it shows me that the problem lies elsewhere. 
Specifically, in that instead of 'moc-tqt' is called directly 'moc'. 
Variable MOC_QT3 should be set to the 'moc-tqt'.

Please try this patch instead of your proposed. This is a 
reduced "essence" of patches 594a27c9, 18173187 and 7b10d93d.

Slavek
-- 


diff --git a/configure.ac b/configure.ac
index 024e833..56ad49f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -484,7 +484,7 @@ if test "x$HAVE_TQT" = "xyes" ; then
         AC_SUBST(QT3_CFLAGS)
         AC_SUBST(QT3_LIBS)
            QT3_PREFIX="`$PKG_CONFIG --variable=prefix qt-mt`/bin"
-        AC_PATH_PROGS(MOC_QT3, [moc-tqt moc], no, [$QT3_PREFIX])
+        AC_PATH_PROGS(MOC_QT3, [moc-tqt], no, [$QT3_PREFIX:$PATH])
         if test "$MOC_QT3" = no; then
             AC_MSG_ERROR([Could not find QT3 moc])
         fi