Am Montag, 10. Dezember 2012 um 23:23:53, schrieb Tommaso Cucinotta <tomm...@lyx.org> > On 10/12/12 22:25, Richard Heck wrote: > > On 12/10/2012 05:16 PM, Tommaso Cucinotta wrote: > >> On 10/12/12 21:46, Tommaso Cucinotta wrote: > >>> when exporting from the command-line, theApp() doesn't exist. Any > >>> possible/meaningful replacement for these hexName() call ? > >> Just came across the attached solution that seems better. Any comment ? > >> Objections to commit ? > >> Don't know why I had to add "QtGui/" in a couple of includes in > >> ColorCache.h. Different CPPFLAGS are provided for the objects in graphics/ > >> and > >> the ones in qt4/ ? > > Are we sure you attached the right patch? This one seems to have my name on > > it, and no QtGui/ business that I can see. > > Ehm, I just made a big mess with git :-), sorry about that. > > Pls, see the attached one instead. > > T.
Hmm... #patch -p1 < /fd/lyx-export-color-v3.patch patching file src/frontends/qt4/ColorCache.h patching file src/graphics/PreviewLoader.cpp patch unexpectedly ends in middle of line Hunk #3 succeeded at 589 with fuzz 1. ... [ 52%] Building CXX object src/graphics/CMakeFiles/graphics.dir/PreviewLoader.cpp.o cd /usr/BUILD/BuildLyxGit/src/graphics && /usr/bin/c++ -Wall -Wunused-parameter -std=gnu++0x -fno-strict-aliasing -Wall -Wunused-parameter -std=gnu++0x -O3 -DNDEBUG -I/usr/BUILD/BuildLyxGit -I/usr/src/lyx/lyx-git/src -I/usr/include/enchant -I/usr/src/lyx/lyx-git/boost -I/usr/src/lyx/lyx-git/src/graphics -DBOOST_USER_CONFIG="<config.h>" -o CMakeFiles/graphics.dir/PreviewLoader.cpp.o -c /usr/src/lyx/lyx-git/src/graphics/PreviewLoader.cpp In file included from /usr/src/lyx/lyx-git/src/graphics/PreviewLoader.cpp:30:0: /usr/src/lyx/lyx-git/src/frontends/qt4/ColorCache.h:17:24: fatal error: QtGui/QColor: No such file or directory OK, this file may be moved to src/frontends/qt4, since it uses QT. For now I added the otherwise not needed include path to cmake... #make package #ctest -R lyx_export Start 40: lyx_export 1/1 Test #40: lyx_export ....................... Passed 264.04 sec 100% tests passed, 0 tests failed out of 1 Total Test time (real) = 264.07 sec Works. I'd like to have it committed. Kornel
signature.asc
Description: This is a digitally signed message part.