--Boundary-00=_hSOIBwZ6h0B4Bw1
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On some systems (seems to be FBSD 4-STABLE) the build of kopete fails in the 
kdenetwork/kopete/protocols/jabber/libiris/iris/xmpp-core subdir with 
considerable weirdness:

>/libiris/iris/xmpp-core' gmake[7]: Circular securestream.cpp <-
> securestream.moc dependency dropped. /usr/X11R6/bin/moc ./securestream.h >
> securestream.moc
> /usr/X11R6/bin/moc ./securestream.cpp >> securestream.moc
> source='connector.cpp' object='libiris_xmpp_core_la-connector.lo'
> libtool=yes \ DEPDIR=.deps depmode=gcc /bin/sh
> ../../../../../../admin/depcomp \ 
#>-         /bin/sh ../../../../../../libtool
> --silent --mode=compile --tag=CXX c++ -DHAVE_CONFIG_H -I. -I.
> -I../../../../../.. -I./../include -I./../xmpp-core -I./../xmpp-im
> -I./../../cutestuff/util -I./../../cutestuff/network -I./../../qca/src
> -I/usr/local/include -I/usr/X11R6/include  -I/usr/local/include
> -D_THREAD_SAFE -pthread -DQT_THREAD_SUPPORT   -I/usr/local/include
> -I/usr/local/include  -I/usr/X11R6/include -D_GETOPT_H -D_THREAD_SAFE
> -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -W -Wpointer-arith
> -Wwrite-strings -DNDEBUG -DNO_DEBUG -O2 -O -pipe -fno-exceptions
> -fno-check-new -fno-common -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST
> -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION -c -o
> libiris_xmpp_core_la-connector.lo `test -f 'connector.cpp' || echo
> './'`connector.cpp ../../../../../../admin/depcomp:
> -Wp,-MD,.deps/libiris_xmpp_core_la-connector.TPlo: not found gmake[7]: ***
> [libiris_xmpp_core_la-connector.lo] Error 127

This might be a consequence of 4-STABLE using gcc 2.95 and some older tools - 
in any case, the release tarballs don't compile nicely. Looking into the 
code, I notice that there is a Q_OBJECT based class in the securestream.cpp 
file, and another in the corresponding header, and the Makefile does tricks 
to handle that. The attached gzipped patch shuffles stuff around a bit to 
create a header file with the Q_OBJECTS, removes the Makefile.am hacks, and, 
well, seems to work. I don't know _why_ the code in question is doing this 
kind of weirdness, though .. there may be a good reason.

Comments? Objections?

Ideally, tarballs would be re-rolled with this applied; otherwise I'll just 
commit sometime soon.

- -- 
   "On top of that [watching KDE CVS] is interesting in a perverse 
    way, like watching sausage get made. By very smart people." - dkite
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)

iD8DBQFBIOShdqzuAf6io/4RAnYaAJ9/u9f8ykGyh6WV5uJ06QiewW8kIgCeKVz3
NDwzXKlOMfc29v7V76dIRXg=
=FVQn
-----END PGP SIGNATURE-----

--Boundary-00=_hSOIBwZ6h0B4Bw1
Content-Type: application/x-gzip;
  name="sanity.diff.gz"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
	filename="sanity.diff.gz"

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
6aN4f3v5sot3WXbrVoA//R/TmmiLUSgAAA==

--Boundary-00=_hSOIBwZ6h0B4Bw1--