Am Samstag, 11. Juni 2016 um 16:57:40, schrieb Scott Kostyshak <skost...@lyx.org> > On Sat, Jun 11, 2016 at 10:47:18PM +0200, Kornel Benko wrote: > > Am Samstag, 11. Juni 2016 um 16:07:42, schrieb Scott Kostyshak > > <skost...@lyx.org> > > > On Wed, Jun 08, 2016 at 11:47:25AM +0200, Kornel Benko wrote: > > > > Am Mittwoch, 8. Juni 2016 um 09:36:05, schrieb Kornel Benko > > > > <kor...@lyx.org> > > > > > commit 8019732b395faa9fafe3b4c644cb72143bdd5dd1 > > > > > Author: Kornel Benko <kor...@lyx.org> > > > > > Date: Wed Jun 8 09:21:48 2016 +0200 > > > > > > > > > > Cmake build: Check for QPA_XCB when QT_USES_X11 is known > > > > > > > > > > Since QT_USES_X11 is determined in ConfigureChecks > > > > > we have to check after this call > > > > > > > > This makes xmingw-script successful again. The fix should go to 2.2.x > > > > too IMHO. > > > > > > I tried xmingw-script on current master but it does not succeed for me. > > > > > > I get the following: > > > > > > error: > > > In file included from > > > /home/scott/lyxbuilds/master/CMakeBuild/src/support/_allinone_const.C:118:0: > > > /home/scott/lyxbuilds/master/repo/src/support/convert.cpp:158:32: error: > > > specialization of ‘Target lyx::convert(Source) [with Target = int; > > > Source = s > > > td::__cxx11::basic_string<char>]’ after instantiation > > > int convert<int>(string const s) > > > > > > For you it succeeds on current master? > > > > Removed the CMakeCache.txt first? Here it compiles. > > I did a clean build. > > > Check if QPA_XCB defined in /home/scott/lyxbuilds/master/CMakeBuild/config.h > > It is defined. Attached is that file.
It should not be.
> I did not mean to say that this commit breaks the compilation. I don't
> remember if I've ever successfully compiled mingw.
>
> There might be other issues. The script downloads something (the first
> time it is run on a system) about Ubuntu 14.04. Also it mentions Qt
> 5.5.1. I am using Qt 5.6dev and am on Ubuntu 16.04, so perhaps it is
> sensitive to a certain environment.
This has no effect. The downloaded files are used, not the installed.
Attached is the diff to my config.h
There are clearly differences.
For instance the dest directory has to be "LYX_INSTALLED", not
"/usr/local/lyx-master".
I would check (with message(STATUS ...)) where this value is set.
> Scott
>
Kornel
Kornel33c33 < #define PACKAGE "LyX2.3" --- > #define PACKAGE "lyx2.3" 43,46c43,46 < #define PROGRAM_SUFFIX "" < #define LYX_ABS_INSTALLED_DATADIR "LYX_INSTALLED" < #define LYX_ABS_INSTALLED_LOCALEDIR "LYX_INSTALLED/Resources/locale" < #define LYX_ABS_TOP_SRCDIR "/usr2/src/lyx/lyx-git" --- > #define PROGRAM_SUFFIX "2.3" > #define LYX_ABS_INSTALLED_DATADIR "/usr/local/lyx-master" > #define LYX_ABS_INSTALLED_LOCALEDIR "/usr/local/lyx-master/share/locale" > #define LYX_ABS_TOP_SRCDIR "/home/scott/lyxbuilds/master/repo" 48,49c48,49 < /* #undef USE_POSIX_PACKAGING */ < #define USE_WINDOWS_PACKAGING 1 --- > #define USE_POSIX_PACKAGING 1 > /* #undef USE_WINDOWS_PACKAGING */ 55c55 < #define LYX_MERGE_FILES 1 --- > /* #undef LYX_MERGE_FILES */ 57c57 < /* #undef LYX_USE_STD_REGEX */ --- > #define LYX_USE_STD_REGEX 1 60c60 < /* #undef LYX_CALLSTACK_PRINTING */ --- > #define LYX_CALLSTACK_PRINTING 1 63c63 < #define STD_STRING_USES_COW 1 --- > /* #undef STD_STRING_USES_COW */ 69c69 < /* #undef USE_GLIBCXX_CXX11_ABI */ --- > #define USE_GLIBCXX_CXX11_ABI 1 71c71 < #define Z_PREFIX 1 --- > /* #undef Z_PREFIX */ 74c74 < /* #undef QPA_XCB */ --- > #define QPA_XCB 1 75a76 > #define USE_ENCHANT 1
signature.asc
Description: This is a digitally signed message part.
