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: Sat, 25 Aug 2012 03:15:23 +0200
On Saturday 25 of August 2012 03:08:26 David C. Rankin wrote:
> 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?

What contain variable MOC_QT3 during your build?
You can show it for example by adding:
  echo $(AM_V_GEN)$(MOC_QT3) moc $^ $@

before patched line.

Slavek
--