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: Fri, 24 Aug 2012 20:08:26 -0500
On 08/24/2012 07:25 PM, Slávek Banko wrote:
> The code that is in the GIT expects, that MOC_QT3 directs to moc-tqt.
> In this case is:
>   $(MOC_QT3) moc $^ -o $@
> 
> expanded to:
>   moc-tqt moc _input_file_ -o _output_file_
> 
> In your build environment probably MOC_QT3 directs to moc-qt3 == is expanded 
> to:
>   moc-qt3 moc _input_file_ -o _output_file_
> 
> And this leads to FTBFS for you. Therefore your patch which remove "moc" 
> solves problem in your build environment. But for others is expanded to:
>   moc-tqt _input_file_ -o _output_file_
> 
> And this leads to FTBFS for others. My patch tries to change your build 
> environment == to set MOC_QT3 to moc-tqt instead of moc-qt3.
> 
> Slavek

Bewildering??

  All I have is:

  cd ${srcdir}

  ## adjust pkgconfig path
  export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/qt3/lib/pkgconfig"

  ## patch avahi-tqt (3.5.13-sru not patched)
  msg "Patching - avahi-tqt..."
  patch -Np0 -i ${srcdir}/avahi-tqt-watch.moc3.diff

  cd ${srcdir}/${pkgname#*-}

  msg "Starting configure..."
  ./autogen.sh --prefix=${TDEDIR} \
    --sysconfdir=/etc \
    --localstatedir=/var

  msg "Building - $pkgname..."
  make

Where the patch is:

--- avahi-tqt/avahi-tqt/Makefile.am
+++ avahi-tqt/avahi-tqt/Makefile.am	2012-08-08 22:06:07.211460764 -0500
@@ -34,7 +34,7 @@
 	qt-watch.cpp

 qt-watch.moc3: qt-watch.cpp
-	$(AM_V_GEN)$(MOC_QT3) moc $^ $@
+	$(AM_V_GEN)$(MOC_QT3) $^ -o $@

 libavahi_tqt_la_CPPFLAGS = $(AM_CFLAGS) $(QT3_CFLAGS) $(VISIBILITY_HIDDEN_CFLAGS)
 libavahi_tqt_la_LIBADD = $(AM_LDADD) $(QT3_LIBS)


I don't see where the difference could be?

-- 
David C. Rankin, J.D.,P.E.