A bunch of trunk build patches coming

So I just tried to migrate to trinity (from trunk as of two days ago, before the latest round of renaming patches). To keep things neat I'm sticking the whole thing excepting tqtinterface into a tree rooted at /usr/trinity/ (henceforward '$trinity_root'). I've built up to tdebase, I've noticed the following build problems (patches follow fixing those for which fixes seem practical). Non-build problems are mostly not mentioned here because I haven't restarted into TDE yet (I want to get more built before then). - If you install tqtinterface as suggested on the wiki, avahi-tqt fails to build: make[2]: Entering directory `/usr/src/kde/trinity/main/dependencies/x86_64-spindle/avahi-tqt' /usr/trinity/bin/moc moc qt-watch.cpp qt-watch.moc3 TQt meta object compiler moc: Too many input files specified This is in part because moc-tqt cannot be found. If we follow the wiki's instructions and install tqtinterface in /usr, it ends up in a different place from TQt and the configure-time search for tmoc fails. Moving tqtinterface into the $trinity_root fixes that, but then the hardwired -I/usr/include/tqt is wrong and the build fails again. The only fix I've found is to install tqtinterface into the $trinity_root, and then symlink /usr/include/tqt to that location. This is, not to put too fine a point on it, insane. I note that even if you *do* install tqtinterface into the $trinity_root, the pkg-config file ends up in ${prefix}/pkgconfig. This appears to be intentional, but is quite mystifying given that all you need to do to avoid it is to set PKG_CONFIG_PATH, which must be set anyway or the build of tqtinterface will fail (because qt-mt.pc is not in /usr/lib/pkgconfig but rather in $trinity_root/lib/pkgconfig.) Is the expectation nowadays that tqt3 is installed in /usr as well, or is this a bug? (I don't have a patch for this because I can't think of a non-insane fix.) - in konsole, meta is not recognized (only alt is). I have a pre-existing patch for this ancient KDE problem. - covariant return type checking is broken, because it's using the C compiler rather than the C++ compiler :) but even if that is fixed, the check still fails, because... - in the cmake FindTQt module, most of the CXXFLAGS are being missed out, leading to spurious failures in CheckCXXSourceRuns. Patches for the latter three problems follow (not as a single git patch series, though, because I can't figure out how to make one of those crossing multiple submodules: anyone?) -- NULL && (void)