On 02/22/2012 03:57 PM, David C. Rankin wrote:
On 02/22/2012 03:34 PM, David C. Rankin wrote:
<snip>
Just confirmed the same behavior on an x86_64 build:
[ 1%] Building C object dcop/KDE-ICE/CMakeFiles/kICE-static.dir/globals.c.o Linking C static library libkICE.a [ 1%] Built target kICE-static [ 1%] Generating dcopclient.moc Scanning dependencies of target DCOP-shared [ 1%] Building CXX object dcop/CMakeFiles/DCOP-shared.dir/dcopstub.cpp.o [ 1%] Building CXX object dcop/CMakeFiles/DCOP-shared.dir/dcopref.cpp.o [ 1%] Building CXX object dcop/CMakeFiles/DCOP-shared.dir/dcopobject.cpp.o [ 1%] Building CXX object dcop/CMakeFiles/DCOP-shared.dir/dcopclient.cpp.o /build/src/tdelibs/dcop/dcopclient.cpp: In member function 'bool DCOPClient::attachInternal(bool)': /build/src/tdelibs/dcop/dcopclient.cpp:785:24: error: 'qint64' was not declared in this scope /build/src/tdelibs/dcop/dcopclient.cpp:785:24: error: expected ')' before numeric constant /build/src/tdelibs/dcop/dcopclient.cpp:785:55: error: expected ')' before ';' token make[2]: *** [dcop/CMakeFiles/DCOP-shared.dir/dcopclient.cpp.o] Error 1 make[1]: *** [dcop/CMakeFiles/DCOP-shared.dir/all] Error 2 make: *** [all] Error 2
I get this when I update my git tree with switch_all_submodules_to_head_and_clean:
Warning: you are leaving 54 commits behind, not connected to any of your branches:
bd9fb5a Update automake files to use tde instead of kde a36ea27 Reset submodule main/tdewebdev/cmake to latest HEAD 3da0c95 Remove spurious TQ_OBJECT instances 1179541 Reset submodule main/tdewebdev/admin to latest HEAD ... and 50 more.
If you want to keep them by creating a new branch, this may be a good time to do so with:
git branch new_branch_name bd9fb5a29f2ddf65a2c042f9ce7b1dd21a8ee73f
Could this be the reason I haven't picked up the fix? If so, how do I fix this?