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: "David C. Rankin" <drankinatty@...>
Date: Mon, 13 Aug 2012 23:15:00 -0500
On 08/13/2012 08:59 PM, Slávek Banko wrote:
> On Thursday 09 of August 2012 07:38:29 David C. Rankin wrote:
>> On 08/08/2012 11:22 PM, David C. Rankin wrote:
>>> Slavek,
>>>
>>>   avahi-tqt for 3.5.13-sru just needs the qt-watch.moc3 fix backported,
>>> then it builds fine. The diff is attached. I can't find a commit in
>>> http://git.trinitydesktop.org/cgit/avahi-tqt/ that matches, so this just
>>> might need to be reviewed and signed off.
>>>
>>>   The reference for the fix is here:
>>>
>>> http://trinity-devel.pearsoncomputing.net/?0::6608
>>
>> I found it, it was commit 	8f7a6ec9f95f
>>
>> OK to backport to 3.5.13-sru
> 
> David,
> 
> I'm a little confused. The original code is:
>   $(AM_V_GEN)$(MOC_QT3) moc $^ $@
> 
> Your proposed patch changes it to:
>   $(AM_V_GEN)$(MOC_QT3) $^ $@
> 
> While commit 8f7a6ec9 changes the moc to tqmoc:
>   $(AM_V_GEN)$(MOC_QT3) tqmoc $^ $@
> 
> Removing moc seems to me suspicious. Similarly, the replacement from moc to 
> tqmoc makes me uncertainty.
> 
> Please have some more information?
> 
> Slavek
> 

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 C. Rankin, J.D.,P.E.