trunk fails to: ./configure --without-included-boost
Hello I am trying to compile trunk with system boost libraries, but fail. Upon running ./configure --without-included-boost on GIT 66cb259, I get this message: The following problems have been detected by configure. Please check the messages below before running 'make'. (see the section 'Problems' in the INSTALL file) ** No suitable boost library found (do not use --without-included-boost) My system (Xubuntu Precise) comes with: * automake = 1.8 * autoconf = 2.59c * gettext = 0.16.1 * libboost-dev == 1.48.0.2 What version of boost does LyX expect? Regards Liviu -- Do you know how to read? http://www.alienetworks.com/srtest.cfm http://goodies.xfce.org/projects/applications/xfce4-dict#speed-reader Do you know how to write? http://garbl.home.comcast.net/~garbl/stylemanual/e.htm#e-mail
Re: [LyX master] Do not let the parent interfere when I child document is exported/view standalone (#8100, #8101)
Richard Heck wrote: Fix attached. Looks good. I'll commit to trunk. For branch, I propose to psotpone to 2.0.6. Jürgen
Re: [LyX master] Fix make check target
Le 05/10/2012 11:57, Jean-Marc Lasgouttes a écrit : The branch, master, has been updated. - Log - commit 4729b1c35de08963cf8b40b59bcf50d427f2bb0c Author: Jean-Marc Lasgouttes lasgout...@lyx.org Date: Fri Oct 5 11:55:23 2012 +0200 Fix make check target A dummy getGuiMessages function was missing. Instead of adding it everywhere, a new file is created that contains all the dummy functions needed by the tests. Pavel, if this satisfies you, I will port to branch. Kornel, this requires some changes to cmake. I will wait until they are don in trunk to backport anyway. JMarc diff --git a/src/support/Makefile.am b/src/support/Makefile.am index 2418168..dc317c0 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -156,18 +156,21 @@ check_convert_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT check_convert_LDFLAGS = $(QT4_LDFLAGS) check_convert_SOURCES = \ tests/check_convert.cpp \ + tests/dummy_functions.cpp \ tests/boost.cpp check_filetools_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI) check_filetools_LDFLAGS = $(QT4_CORE_LDFLAGS) check_filetools_SOURCES = \ tests/check_filetools.cpp \ + tests/dummy_functions.cpp \ tests/boost.cpp check_lstrings_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI) check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS) check_lstrings_SOURCES = \ tests/check_lstrings.cpp \ + tests/dummy_functions.cpp \ tests/boost.cpp makeregfiles: ${check_PROGRAMS} diff --git a/src/support/tests/check_convert.cpp b/src/support/tests/check_convert.cpp index 30ea647..1e12a46 100644 --- a/src/support/tests/check_convert.cpp +++ b/src/support/tests/check_convert.cpp @@ -1,7 +1,6 @@ #include config.h #include ../convert.h -#include ../docstring.h #include iostream @@ -9,18 +8,6 @@ using lyx::convert; using namespace std; - -namespace lyx { - // Dummy LyXRC support - struct LyXRC { string icon_set; } lyxrc; - - // Keep the linker happy on Windows - void lyx_exit(int) {} - - docstring const _(string const s) { return from_ascii(s); } -} - - void convert_int() { cout convertint(123) '\n' diff --git a/src/support/tests/check_filetools.cpp b/src/support/tests/check_filetools.cpp index 7da548a..ad657fa 100644 --- a/src/support/tests/check_filetools.cpp +++ b/src/support/tests/check_filetools.cpp @@ -10,16 +10,6 @@ using namespace lyx::support; using namespace std; -namespace lyx { - // Dummy LyXRC support - struct LyXRC { string icon_set; } lyxrc; - - // Keep the linker happy on Windows - void lyx_exit(int) {} - - docstring const _(string const s) { return from_ascii(s); } -} - void test_normalizePath() { cout FileName(/foo/../bar).absFileName() endl; diff --git a/src/support/tests/check_lstrings.cpp b/src/support/tests/check_lstrings.cpp index 8a4aea8..3509e45 100644 --- a/src/support/tests/check_lstrings.cpp +++ b/src/support/tests/check_lstrings.cpp @@ -10,16 +10,6 @@ using namespace lyx; using namespace std; -namespace lyx { - // Dummy LyXRC support - struct LyXRC { string icon_set; } lyxrc; - - // Keep the linker happy on Windows - void lyx_exit(int) {} - - docstring const _(string const s) { return from_ascii(s); } -} - void test_lowercase() { cout to_ascii(docstring(1, lowercase(char_type('A' endl; diff --git a/src/support/tests/dummy_functions.cpp b/src/support/tests/dummy_functions.cpp new file mode 100644 index 000..229198e --- /dev/null +++ b/src/support/tests/dummy_functions.cpp @@ -0,0 +1,23 @@ +#include config.h + +#include ../Messages.h + +using namespace std; + +namespace lyx { + // Dummy LyXRC support + struct LyXRC { string icon_set; } lyxrc; + + // Keep the linker happy on Windows + void lyx_exit(int) {} + + docstring const _(string const s) { return from_ascii(s); } + + // Dummy language support + Messages const getGuiMessages() + { + static Messages lyx_messages; + + return lyx_messages; + } +} --- Summary of changes: src/support/Makefile.am |3 +++ src/support/tests/check_convert.cpp | 13 - src/support/tests/check_filetools.cpp | 10 -- src/support/tests/check_lstrings.cpp | 10 -- src/support/tests/dummy_functions.cpp | 23 +++ 5 files changed, 26 insertions(+), 33 deletions(-) create mode 100644 src/support/tests/dummy_functions.cpp hooks/post-receive
Re: trunk fails to: ./configure --without-included-boost
Le 05/10/2012 10:40, Liviu Andronic a écrit : Hello I am trying to compile trunk with system boost libraries, but fail. Upon running ./configure --without-included-boost What error do you get in config.log? JMarc
Tests in src/support/tests
Hi, I wanted to add the target makeregfiles to cmake build. But the tests (in automake) are messing the source tree, which I would like to omit in cmake build. Could they please be rewritten to work in build-tree? Kornel signature.asc Description: This is a digitally signed message part.
Re: Re: [LyX master] Fix make check target
Am Freitag, 5. Oktober 2012 um 12:05:57, schrieb Jean-Marc Lasgouttes lasgout...@lyx.org Le 05/10/2012 11:57, Jean-Marc Lasgouttes a écrit : The branch, master, has been updated. - Log - commit 4729b1c35de08963cf8b40b59bcf50d427f2bb0c Author: Jean-Marc Lasgouttes lasgout...@lyx.org Date: Fri Oct 5 11:55:23 2012 +0200 Fix make check target A dummy getGuiMessages function was missing. Instead of adding it everywhere, a new file is created that contains all the dummy functions needed by the tests. Pavel, if this satisfies you, I will port to branch. Kornel, this requires some changes to cmake. I will wait until they are don in trunk to backport anyway. As of now, there is no change in cmake because cmake does not handle the checks yet. Kornel signature.asc Description: This is a digitally signed message part.
Re: trunk fails to: ./configure --without-included-boost
On Fri, Oct 5, 2012 at 12:28 PM, Jean-Marc Lasgouttes lasgout...@lyx.org wrote: What error do you get in config.log? Oh, sorry. Forgot to attach the relevant files. I think that this is the relevant part: configure:7351: checking whether to use included boost library configure:7369: result: no configure:7392: g++ -o conftest -g -O -Wextra -Wall-lboost_signals -lm conftest.cpp 5 /tmp/ccYb1T1P.o: In function `~signal0': /usr/include/boost/signals/signal_template.hpp:139: undefined reference to `boost::signals::trackable::~trackable()' /usr/include/boost/signals/signal_template.hpp:139: undefined reference to `boost::signals::detail::signal_base::~signal_base()' /tmp/ccYb1T1P.o: In function `~signal': /usr/include/boost/signals/signal_template.hpp:139: undefined reference to `boost::signals::detail::signal_base::~signal_base()' /tmp/ccYb1T1P.o: In function `signal0': /usr/include/boost/signals/signal_template.hpp:197: undefined reference to `boost::signals::detail::signal_base::signal_base(boost::function2bool, boost::signals::detail::stored_group, boost::signals::detail::stored_group const, boost::any const)' collect2: ld returned 1 exit status configure:7392: $? = 1 configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME LyX | #define PACKAGE_TARNAME lyx | #define PACKAGE_VERSION 2.1.0dev | #define PACKAGE_STRING LyX 2.1.0dev | #define PACKAGE_BUGREPORT lyx-devel@lists.lyx.org | #define PACKAGE_URL | #define DEVEL_VERSION 1 | #define USE_POSIX_PACKAGING 1 | #define PACKAGE lyx | #define STDC_HEADERS 1 | #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_STAT_H 1 | #define HAVE_STDLIB_H 1 | #define HAVE_STRING_H 1 | #define HAVE_MEMORY_H 1 | #define HAVE_STRINGS_H 1 | #define HAVE_INTTYPES_H 1 | #define HAVE_STDINT_H 1 | #define HAVE_UNISTD_H 1 | #define ENABLE_ASSERTIONS 1 | #define _GLIBCXX_DEBUG 1 | #define _GLIBCXX_DEBUG_PEDANTIC 1 | #define _GLIBCXX_CONCEPT_CHECKS 1 | /* end confdefs.h. */ | #include boost/signal.hpp | int | main () | { | boost::signalvoid () s; | ; | return 0; | } Liviu
Re: Re: trunk fails to: ./configure --without-included-boost
Am Freitag, 5. Oktober 2012 um 13:21:48, schrieb Liviu Andronic landronim...@gmail.com On Fri, Oct 5, 2012 at 12:28 PM, Jean-Marc Lasgouttes lasgout...@lyx.org wrote: What error do you get in config.log? Oh, sorry. Forgot to attach the relevant files. I think that this is the relevant part: configure:7351: checking whether to use included boost library configure:7369: result: no configure:7392: g++ -o conftest -g -O -Wextra -Wall-lboost_signals -lm conftest.cpp 5 /tmp/ccYb1T1P.o: In function `~signal0': /usr/include/boost/signals/signal_template.hpp:139: undefined reference to `boost::signals::trackable::~trackable()' /usr/include/boost/signals/signal_template.hpp:139: undefined reference to `boost::signals::detail::signal_base::~signal_base()' /tmp/ccYb1T1P.o: In function `~signal': /usr/include/boost/signals/signal_template.hpp:139: undefined reference to `boost::signals::detail::signal_base::~signal_base()' /tmp/ccYb1T1P.o: In function `signal0': /usr/include/boost/signals/signal_template.hpp:197: undefined reference to `boost::signals::detail::signal_base::signal_base(boost::function2bool, boost::signals::detail::stored_group, boost::signals::detail::stored_group const, boost::any const)' collect2: ld returned 1 exit status configure:7392: $? = 1 I have tried the same with cmake on ubuntu, no problems. The relevant link command was here: /usr/bin/c++ -lboost_signals-mt -lboost_regex-mt ... # ldd bin/lyx|grep boost libboost_signals.so.1.46.1 = /usr/lib/libboost_signals.so.1.46.1 (0x7f0cae038000) libboost_regex.so.1.46.1 = /usr/lib/libboost_regex.so.1.46.1 (0x7f0cadd35000) # dpkg -S /usr/lib/libboost_signals.so.1.46.1 /usr/lib/libboost_regex.so.1.46.1 libboost-signals1.46.1: /usr/lib/libboost_signals.so.1.46.1 libboost-regex1.46.1: /usr/lib/libboost_regex.so.1.46.1 Kornel signature.asc Description: This is a digitally signed message part.
Re: Re: trunk fails to: ./configure --without-included-boost
On Fri, Oct 5, 2012 at 1:47 PM, Kornel Benko kor...@lyx.org wrote: # dpkg -S /usr/lib/libboost_signals.so.1.46.1 /usr/lib/libboost_regex.so.1.46.1 libboost-signals1.46.1: /usr/lib/libboost_signals.so.1.46.1 libboost-regex1.46.1: /usr/lib/libboost_regex.so.1.46.1 For some reason (previous upgrade from Lucid to Precise?) I had several liboost 1.40.0 libraries laying around. Now I uninstalled them all and currently I only have 1.46.1 boost libraries on my system. However configure still fails with the same error message. What else could I try to get this to work? Liviu
Re: Re: Re: trunk fails to: ./configure --without-included-boost
Am Freitag, 5. Oktober 2012 um 14:20:45, schrieb Liviu Andronic landronim...@gmail.com On Fri, Oct 5, 2012 at 1:47 PM, Kornel Benko kor...@lyx.org wrote: # dpkg -S /usr/lib/libboost_signals.so.1.46.1 /usr/lib/libboost_regex.so.1.46.1 libboost-signals1.46.1: /usr/lib/libboost_signals.so.1.46.1 libboost-regex1.46.1: /usr/lib/libboost_regex.so.1.46.1 For some reason (previous upgrade from Lucid to Precise?) I, too have Precise ..., so this should not be the reason. I had several liboost 1.40.0 libraries laying around. I have too, so no problem either ... Now I uninstalled them all and currently I only have 1.46.1 boost libraries on my system. However configure still fails with the same error message. What else could I try to get this to work? Did not test, but your configure message seems to indicate the cause (it would here) configure:7392: g++ -o conftest -g -O -Wextra -Wall-lboost_signals -lm conftest.cpp 5 it may be better with -lboost_signals-mt Liviu Kornel signature.asc Description: This is a digitally signed message part.
Re: [LyX master] Fix make check target
Le 05/10/2012 12:44, Kornel Benko a écrit : As of now, there is no change in cmake because cmake does not handle the checks yet. OK, thanks. JMarc
Re: trunk fails to: ./configure --without-included-boost
Le 05/10/2012 13:21, Liviu Andronic a écrit : On Fri, Oct 5, 2012 at 12:28 PM, Jean-Marc Lasgouttes lasgout...@lyx.org mailto:lasgout...@lyx.org wrote: What error do you get in config.log? Oh, sorry. Forgot to attach the relevant files. I think that this is the relevant part: configure:7351: checking whether to use included boost library configure:7369: result: no configure:7392: g++ -o conftest -g -O -Wextra -Wall-lboost_signals -lm conftest.cpp 5 Normally, the checks looks at both boost-signals and boost-signals-mt. Could you look later in the log file for more information? JMarc
Re: [RFC] [Patch] Rescan TeX Files on Configure
Jürgen Spitzmüller wrote: Thus, I propose the attached patch (for trunk only). Objections? Since there were none, I went ahead and committed. Jürgen
Re: Tests in src/support/tests
Le 05/10/2012 12:39, Kornel Benko a écrit : I wanted to add the target makeregfiles to cmake build. But the tests (in automake) are messing the source tree, which I would like to omit in cmake build. Could they please be rewritten to work in build-tree? As this target regenerates the reference output for the tests, which live in the git repo, I do not see why they should not go to the source tree. JMarc
Re: trunk fails to: ./configure --without-included-boost
On Fri, Oct 5, 2012 at 3:04 PM, Jean-Marc Lasgouttes lasgout...@lyx.org wrote: Normally, the checks looks at both boost-signals and boost-signals-mt. Could you look later in the log file for more information? Indeed, I missed this one: configure:7409: g++ -o conftest -g -O -Wextra -Wall-lboost_signals-mt -lm conftest.cpp 5 /tmp/ccV8BYrI.o: In function `~signal0': /usr/include/boost/signals/signal_template.hpp:139: undefined reference to `boost::signals::trackable::~trackable()' /usr/include/boost/signals/signal_template.hpp:139: undefined reference to `boost::signals::detail::signal_base::~signal_base()' /tmp/ccV8BYrI.o: In function `~signal': /usr/include/boost/signals/signal_template.hpp:139: undefined reference to `boost::signals::detail::signal_base::~signal_base()' /tmp/ccV8BYrI.o: In function `signal0': /usr/include/boost/signals/signal_template.hpp:197: undefined reference to `boost::signals::detail::signal_base::signal_base(boost::function2bool, boost::signals::detail::stored_group, boost::signals::detail::stored_group const, boost::any const)' collect2: ld returned 1 exit status configure:7409: $? = 1 configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME LyX | #define PACKAGE_TARNAME lyx | #define PACKAGE_VERSION 2.1.0dev | #define PACKAGE_STRING LyX 2.1.0dev | #define PACKAGE_BUGREPORT lyx-devel@lists.lyx.org | #define PACKAGE_URL | #define DEVEL_VERSION 1 | #define USE_POSIX_PACKAGING 1 | #define PACKAGE lyx | #define STDC_HEADERS 1 | #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_STAT_H 1 | #define HAVE_STDLIB_H 1 | #define HAVE_STRING_H 1 | #define HAVE_MEMORY_H 1 | #define HAVE_STRINGS_H 1 | #define HAVE_INTTYPES_H 1 | #define HAVE_STDINT_H 1 | #define HAVE_UNISTD_H 1 | #define ENABLE_ASSERTIONS 1 | #define _GLIBCXX_DEBUG 1 | #define _GLIBCXX_DEBUG_PEDANTIC 1 | #define _GLIBCXX_CONCEPT_CHECKS 1 | /* end confdefs.h. */ | #include boost/signal.hpp | int | main () | { | boost::signalvoid () s; | ; | return 0; | } And here's the full log: http://s000.tinyupload.com/index.php?file_id=58601548012274014346gk=cisco Any hints there on what's wrong? Liviu
Re: Re: [LyX master] Fix make check target
Am Freitag, 5. Oktober 2012 um 14:59:57, schrieb Jean-Marc Lasgouttes lasgout...@lyx.org Le 05/10/2012 12:44, Kornel Benko a écrit : As of now, there is no change in cmake because cmake does not handle the checks yet. OK, thanks. JMarc Now it does. Kornel signature.asc Description: This is a digitally signed message part.
BeginLabelType/BeginLabelString Feature request.
I would like to request and also sponsor a new feature for LyX. I propose the addition to styles entitled BeginLabelType and BeginLabelString that would behave similar to EndLabelType and EndLabelString but would place the label at the beginning of the paragraph (or sequence of paragraphs if LatexType is Environment, Item_Environment or List_Environment). I will sponsor $100 towards this feature. Kind regards, John.
Re: Re: Tests in src/support/tests
Am Freitag, 5. Oktober 2012 um 15:17:07, schrieb Jean-Marc Lasgouttes lasgout...@lyx.org Le 05/10/2012 12:39, Kornel Benko a écrit : I wanted to add the target makeregfiles to cmake build. But the tests (in automake) are messing the source tree, which I would like to omit in cmake build. Could they please be rewritten to work in build-tree? As this target regenerates the reference output for the tests, which live in the git repo, I do not see why they should not go to the source tree. JMarc The target makeregfiles creates ${srcdir}/tests/regfiles/check_{convert,filetools,lstrings} Kornel signature.asc Description: This is a digitally signed message part.
Re: BeginLabelType/BeginLabelString Feature request.
On 10/05/2012 11:06 AM, John Carbone wrote: I would like to request and also sponsor a new feature for LyX. I propose the addition to styles entitled “BeginLabelType” and “BeginLabelString” that would behave similar to “EndLabelType” and “EndLabelString” but would place the label at the beginning of the paragraph (or sequence of paragraphs if LatexType is Environment, Item_Environment or List_Environment). I will sponsor $100 towards this feature. Please file this as an enhancement bug. Also, please be aware that this could only be done for LyX 2.1.0, since it would be a file format change. Richard
Re: Tests in src/support/tests
Le 05/10/2012 17:08, Kornel Benko a écrit : As this target regenerates the reference output for the tests, which live in the git repo, I do not see why they should not go to the source tree. The target makeregfiles creates ${srcdir}/tests/regfiles/check_{convert,filetools,lstrings} Indeed. But is it a problem? JMarc
Re: Re: Tests in src/support/tests
Am Freitag, 5. Oktober 2012 um 17:45:18, schrieb Jean-Marc Lasgouttes lasgout...@lyx.org Le 05/10/2012 17:08, Kornel Benko a écrit : As this target regenerates the reference output for the tests, which live in the git repo, I do not see why they should not go to the source tree. The target makeregfiles creates ${srcdir}/tests/regfiles/check_{convert,filetools,lstrings} Indeed. But is it a problem? JMarc No, cosmetics reasons only. Nothing should mess source tree if one wants to build outside the source. This way there may be any number of build trees (each different configured). Kornel signature.asc Description: This is a digitally signed message part.
Re: Tests in src/support/tests
Le 05/10/2012 17:50, Kornel Benko a écrit : No, cosmetics reasons only. Nothing should mess source tree if one wants to build outside the source. This way there may be any number of build trees (each different configured). I'd say that _some_ special make target can be intended to modify the source code. This is already the case of the update-po rule in po/ directory. JMarc
Re: [LyX master] Prevent the PreviewLoader from orphaning children
Richard, this needs to go to branch as well, as an addition to 2f3acae9. Jürgen Am Freitag 05 Oktober 2012, 18:28:44 schrieb Juergen Spitzmueller: The branch, master, has been updated. - Log - commit e6afdf1b2b1f707a69ac5b2ddb9056443b0a89b4 Author: Juergen Spitzmueller sp...@lyx.org Date: Fri Oct 5 18:28:38 2012 +0200 Prevent the PreviewLoader from orphaning children diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp index 6185681..433082b 100644 --- a/src/graphics/PreviewLoader.cpp +++ b/src/graphics/PreviewLoader.cpp @@ -716,6 +716,8 @@ void PreviewLoader::Impl::dumpPreamble(otexstream os) const runparams.nice = true; runparams.moving_arg = true; runparams.free_spacing = true; + if (buffer_.parent()) + runparams.is_child = true; buffer_.writeLaTeXSource(os, buffer_.filePath(), runparams, Buffer::OnlyPreamble); // FIXME! This is a HACK! The proper fix is to control the 'true' --- Summary of changes: src/graphics/PreviewLoader.cpp |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) hooks/post-receive
Re: [LyX master] Prevent the PreviewLoader from orphaning children
Jürgen Spitzmüller wrote: Richard, this needs to go to branch as well, as an addition to 2f3acae9. No, sorry. Actually, it's (only) this that needs to go to branch also. dumpPreamble() exits after the preamble, so we need to restore the parenthood there: commit 63612ca99b4961c5997c788626da81553233ff9f Author: Juergen Spitzmueller sp...@lyx.org Date: Fri Oct 5 19:26:07 2012 +0200 Restore buffer parenthood if we exit already after the preamble diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 3561c45..8b052ad 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -1592,8 +1592,12 @@ void Buffer::writeLaTeXSource(otexstream os, runparams.use_japanese = features.isRequired(japanese); - if (!output_body) + if (!output_body) { + // Restore the parenthood if needed + if (!runparams.is_child) + d-ignore_parent = false; return; + } // make the body. os \\begin{document}\n; OK? Jürgen
Re: [LyX master] Fix make check target
Jean-Marc Lasgouttes wrote: Pavel, if this satisfies you, I will port to branch. Works here. Pavel
Re: [LyX master] Merge branch 'master' of git.lyx.org:lyx
Juergen Spitzmueller wrote: commit 2fa840b7716f5907362a1457b5ed189e675cfb57 Author: Juergen Spitzmueller sp...@lyx.org Date: Fri Oct 5 09:59:44 2012 +0200 Do not let the children's buffer params leak into the master (#5941) Thanks Juergen. Pavel
Re: Re: Re: trunk fails to: ./configure --without-included-boost
On Fri, Oct 5, 2012 at 2:50 PM, Kornel Benko kor...@lyx.org wrote: I, too have Precise ..., so this should not be the reason. several liboost 1.40.0 libraries laying around. I have too, so no problem either ... Hmm, but does it work when you use autotools instead of cmake? Liviu
Re: [PATCH] lyxknitr failed when /tmp on different fs
Are these patches OK for trunk and branch? Thanks, Scott On Tue, Oct 2, 2012 at 6:34 AM, Scott Kostyshak skost...@lyx.org wrote: On Mon, Oct 1, 2012 at 9:43 AM, Richard Heck rgh...@lyx.org wrote: On 10/01/2012 04:04 AM, Jean-Marc Lasgouttes wrote: Le 01/10/2012 08:56, Scott Kostyshak a écrit : On Mon, Oct 1, 2012 at 2:46 AM, Yihui Xie x...@yihui.name wrote: I have tested it on my Windows 7 and I did not see any problems. Great, thanks for doing that Yihui. In that case, the question becomes -- should this be committed only to trunk? I would be in favor of committing it to branch, but I'm not sure if it's best to do that before or after 2.0.5 is released. Anyone else have an opinion? I think it should go to trunk and branch: is is simpler now (always good) and I trust that Yihui tested it thoroughly. Good for branch, then. Scott, you know about status.20x, yes? I do, but I would have forgotten to update it. Thank you for the reminder. Attached are the patches for trunk and branch. Are they OK? Thanks, Scott
trunk fails to: ./configure --without-included-boost
Hello I am trying to compile trunk with system boost libraries, but fail. Upon running ./configure --without-included-boost on GIT 66cb259, I get this message: The following problems have been detected by configure. Please check the messages below before running 'make'. (see the section 'Problems' in the INSTALL file) ** No suitable boost library found (do not use --without-included-boost) My system (Xubuntu Precise) comes with: * automake >= 1.8 * autoconf >= 2.59c * gettext >= 0.16.1 * libboost-dev == 1.48.0.2 What version of boost does LyX expect? Regards Liviu -- Do you know how to read? http://www.alienetworks.com/srtest.cfm http://goodies.xfce.org/projects/applications/xfce4-dict#speed-reader Do you know how to write? http://garbl.home.comcast.net/~garbl/stylemanual/e.htm#e-mail
Re: [LyX master] Do not let the parent interfere when I child document is exported/view standalone (#8100, #8101)
Richard Heck wrote: > > Fix attached. > > Looks good. I'll commit to trunk. For branch, I propose to psotpone to 2.0.6. Jürgen
Re: [LyX master] Fix make check target
Le 05/10/2012 11:57, Jean-Marc Lasgouttes a écrit : The branch, master, has been updated. - Log - commit 4729b1c35de08963cf8b40b59bcf50d427f2bb0c Author: Jean-Marc LasgouttesDate: Fri Oct 5 11:55:23 2012 +0200 Fix make check target A dummy getGuiMessages function was missing. Instead of adding it everywhere, a new file is created that contains all the dummy functions needed by the tests. Pavel, if this satisfies you, I will port to branch. Kornel, this requires some changes to cmake. I will wait until they are don in trunk to backport anyway. JMarc diff --git a/src/support/Makefile.am b/src/support/Makefile.am index 2418168..dc317c0 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -156,18 +156,21 @@ check_convert_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT check_convert_LDFLAGS = $(QT4_LDFLAGS) check_convert_SOURCES = \ tests/check_convert.cpp \ + tests/dummy_functions.cpp \ tests/boost.cpp check_filetools_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI) check_filetools_LDFLAGS = $(QT4_CORE_LDFLAGS) check_filetools_SOURCES = \ tests/check_filetools.cpp \ + tests/dummy_functions.cpp \ tests/boost.cpp check_lstrings_LDADD = liblyxsupport.a $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) $(QT4_CORE_LIBS) $(LIBSHLWAPI) check_lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS) check_lstrings_SOURCES = \ tests/check_lstrings.cpp \ + tests/dummy_functions.cpp \ tests/boost.cpp makeregfiles: ${check_PROGRAMS} diff --git a/src/support/tests/check_convert.cpp b/src/support/tests/check_convert.cpp index 30ea647..1e12a46 100644 --- a/src/support/tests/check_convert.cpp +++ b/src/support/tests/check_convert.cpp @@ -1,7 +1,6 @@ #include #include "../convert.h" -#include "../docstring.h" #include @@ -9,18 +8,6 @@ using lyx::convert; using namespace std; - -namespace lyx { - // Dummy LyXRC support - struct LyXRC { string icon_set; } lyxrc; - - // Keep the linker happy on Windows - void lyx_exit(int) {} - - docstring const _(string const & s) { return from_ascii(s); } -} - - void convert_int() { cout << convert("123") << '\n' diff --git a/src/support/tests/check_filetools.cpp b/src/support/tests/check_filetools.cpp index 7da548a..ad657fa 100644 --- a/src/support/tests/check_filetools.cpp +++ b/src/support/tests/check_filetools.cpp @@ -10,16 +10,6 @@ using namespace lyx::support; using namespace std; -namespace lyx { - // Dummy LyXRC support - struct LyXRC { string icon_set; } lyxrc; - - // Keep the linker happy on Windows - void lyx_exit(int) {} - - docstring const _(string const & s) { return from_ascii(s); } -} - void test_normalizePath() { cout << FileName("/foo/../bar").absFileName() << endl; diff --git a/src/support/tests/check_lstrings.cpp b/src/support/tests/check_lstrings.cpp index 8a4aea8..3509e45 100644 --- a/src/support/tests/check_lstrings.cpp +++ b/src/support/tests/check_lstrings.cpp @@ -10,16 +10,6 @@ using namespace lyx; using namespace std; -namespace lyx { - // Dummy LyXRC support - struct LyXRC { string icon_set; } lyxrc; - - // Keep the linker happy on Windows - void lyx_exit(int) {} - - docstring const _(string const & s) { return from_ascii(s); } -} - void test_lowercase() { cout << to_ascii(docstring(1, lowercase(char_type('A' << endl; diff --git a/src/support/tests/dummy_functions.cpp b/src/support/tests/dummy_functions.cpp new file mode 100644 index 000..229198e --- /dev/null +++ b/src/support/tests/dummy_functions.cpp @@ -0,0 +1,23 @@ +#include + +#include "../Messages.h" + +using namespace std; + +namespace lyx { + // Dummy LyXRC support + struct LyXRC { string icon_set; } lyxrc; + + // Keep the linker happy on Windows + void lyx_exit(int) {} + + docstring const _(string const & s) { return from_ascii(s); } + + // Dummy language support + Messages const & getGuiMessages() + { + static Messages lyx_messages; + + return lyx_messages; + } +} --- Summary of changes: src/support/Makefile.am |3 +++ src/support/tests/check_convert.cpp | 13 - src/support/tests/check_filetools.cpp | 10 -- src/support/tests/check_lstrings.cpp | 10 -- src/support/tests/dummy_functions.cpp | 23 +++ 5 files changed, 26 insertions(+), 33 deletions(-) create mode 100644 src/support/tests/dummy_functions.cpp hooks/post-receive
Re: trunk fails to: ./configure --without-included-boost
Le 05/10/2012 10:40, Liviu Andronic a écrit : Hello I am trying to compile trunk with system boost libraries, but fail. Upon running ./configure --without-included-boost What error do you get in config.log? JMarc
Tests in src/support/tests
Hi, I wanted to add the target makeregfiles to cmake build. But the tests (in automake) are messing the source tree, which I would like to omit in cmake build. Could they please be rewritten to work in build-tree? Kornel signature.asc Description: This is a digitally signed message part.
Re: Re: [LyX master] Fix make check target
Am Freitag, 5. Oktober 2012 um 12:05:57, schrieb Jean-Marc Lasgouttes> Le 05/10/2012 11:57, Jean-Marc Lasgouttes a écrit : > > The branch, master, has been updated. > > > > - Log - > > > > commit 4729b1c35de08963cf8b40b59bcf50d427f2bb0c > > Author: Jean-Marc Lasgouttes > > Date: Fri Oct 5 11:55:23 2012 +0200 > > > > Fix make check target > > > > A dummy getGuiMessages function was missing. Instead of adding it > > everywhere, a new file is created that contains all the dummy functions > > needed by the tests. > > Pavel, if this satisfies you, I will port to branch. > > Kornel, this requires some changes to cmake. I will wait until they are > don in trunk to backport anyway. > As of now, there is no change in cmake because cmake does not handle the checks yet. Kornel signature.asc Description: This is a digitally signed message part.
Re: trunk fails to: ./configure --without-included-boost
On Fri, Oct 5, 2012 at 12:28 PM, Jean-Marc Lasgoutteswrote: > What error do you get in config.log? > Oh, sorry. Forgot to attach the relevant files. I think that this is the relevant part: configure:7351: checking whether to use included boost library configure:7369: result: no configure:7392: g++ -o conftest -g -O -Wextra -Wall-lboost_signals -lm conftest.cpp >&5 /tmp/ccYb1T1P.o: In function `~signal0': /usr/include/boost/signals/signal_template.hpp:139: undefined reference to `boost::signals::trackable::~trackable()' /usr/include/boost/signals/signal_template.hpp:139: undefined reference to `boost::signals::detail::signal_base::~signal_base()' /tmp/ccYb1T1P.o: In function `~signal': /usr/include/boost/signals/signal_template.hpp:139: undefined reference to `boost::signals::detail::signal_base::~signal_base()' /tmp/ccYb1T1P.o: In function `signal0': /usr/include/boost/signals/signal_template.hpp:197: undefined reference to `boost::signals::detail::signal_base::signal_base(boost::function2 const&, boost::any const&)' collect2: ld returned 1 exit status configure:7392: $? = 1 configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "LyX" | #define PACKAGE_TARNAME "lyx" | #define PACKAGE_VERSION "2.1.0dev" | #define PACKAGE_STRING "LyX 2.1.0dev" | #define PACKAGE_BUGREPORT "lyx-devel@lists.lyx.org" | #define PACKAGE_URL "" | #define DEVEL_VERSION 1 | #define USE_POSIX_PACKAGING 1 | #define PACKAGE "lyx" | #define STDC_HEADERS 1 | #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_STAT_H 1 | #define HAVE_STDLIB_H 1 | #define HAVE_STRING_H 1 | #define HAVE_MEMORY_H 1 | #define HAVE_STRINGS_H 1 | #define HAVE_INTTYPES_H 1 | #define HAVE_STDINT_H 1 | #define HAVE_UNISTD_H 1 | #define ENABLE_ASSERTIONS 1 | #define _GLIBCXX_DEBUG 1 | #define _GLIBCXX_DEBUG_PEDANTIC 1 | #define _GLIBCXX_CONCEPT_CHECKS 1 | /* end confdefs.h. */ | #include | int | main () | { | boost::signal s; | ; | return 0; | } Liviu
Re: Re: trunk fails to: ./configure --without-included-boost
Am Freitag, 5. Oktober 2012 um 13:21:48, schrieb Liviu Andronic> On Fri, Oct 5, 2012 at 12:28 PM, Jean-Marc Lasgouttes > wrote: > > What error do you get in config.log? > > > Oh, sorry. Forgot to attach the relevant files. I think that this is the > relevant part: > configure:7351: checking whether to use included boost library > configure:7369: result: no > configure:7392: g++ -o conftest -g -O -Wextra -Wall-lboost_signals -lm > conftest.cpp >&5 > /tmp/ccYb1T1P.o: In function `~signal0': > /usr/include/boost/signals/signal_template.hpp:139: undefined reference to > `boost::signals::trackable::~trackable()' > /usr/include/boost/signals/signal_template.hpp:139: undefined reference to > `boost::signals::detail::signal_base::~signal_base()' > /tmp/ccYb1T1P.o: In function `~signal': > /usr/include/boost/signals/signal_template.hpp:139: undefined reference to > `boost::signals::detail::signal_base::~signal_base()' > /tmp/ccYb1T1P.o: In function `signal0': > /usr/include/boost/signals/signal_template.hpp:197: undefined reference to > `boost::signals::detail::signal_base::signal_base(boost::function2 boost::signals::detail::stored_group, boost::signals::detail::stored_group> > const&, boost::any const&)' > collect2: ld returned 1 exit status > configure:7392: $? = 1 I have tried the same with cmake on ubuntu, no problems. The relevant link command was here: /usr/bin/c++ -lboost_signals-mt -lboost_regex-mt ... # ldd bin/lyx|grep boost libboost_signals.so.1.46.1 => /usr/lib/libboost_signals.so.1.46.1 (0x7f0cae038000) libboost_regex.so.1.46.1 => /usr/lib/libboost_regex.so.1.46.1 (0x7f0cadd35000) # dpkg -S /usr/lib/libboost_signals.so.1.46.1 /usr/lib/libboost_regex.so.1.46.1 libboost-signals1.46.1: /usr/lib/libboost_signals.so.1.46.1 libboost-regex1.46.1: /usr/lib/libboost_regex.so.1.46.1 Kornel signature.asc Description: This is a digitally signed message part.
Re: Re: trunk fails to: ./configure --without-included-boost
On Fri, Oct 5, 2012 at 1:47 PM, Kornel Benkowrote: > # dpkg -S /usr/lib/libboost_signals.so.1.46.1 > /usr/lib/libboost_regex.so.1.46.1 > > libboost-signals1.46.1: /usr/lib/libboost_signals.so.1.46.1 > > libboost-regex1.46.1: /usr/lib/libboost_regex.so.1.46.1 > For some reason (previous upgrade from Lucid to Precise?) I had several liboost 1.40.0 libraries laying around. Now I uninstalled them all and currently I only have 1.46.1 boost libraries on my system. However configure still fails with the same error message. What else could I try to get this to work? Liviu
Re: Re: Re: trunk fails to: ./configure --without-included-boost
Am Freitag, 5. Oktober 2012 um 14:20:45, schrieb Liviu Andronic> On Fri, Oct 5, 2012 at 1:47 PM, Kornel Benko wrote: > > # dpkg -S /usr/lib/libboost_signals.so.1.46.1 > > /usr/lib/libboost_regex.so.1.46.1 > > > > libboost-signals1.46.1: /usr/lib/libboost_signals.so.1.46.1 > > > > libboost-regex1.46.1: /usr/lib/libboost_regex.so.1.46.1 > > > For some reason (previous upgrade from Lucid to Precise?) I, too have Precise ..., so this should not be the reason. > I had > several liboost 1.40.0 libraries laying around. I have too, so no problem either ... > Now I uninstalled them > all and currently I only have 1.46.1 boost libraries on my system. > However configure still fails with the same error message. What else > could I try to get this to work? Did not test, but your configure message seems to indicate the cause (it would here) > configure:7392: g++ -o conftest -g -O -Wextra -Wall-lboost_signals -lm > conftest.cpp >&5 it may be better with "-lboost_signals-mt" > Liviu Kornel signature.asc Description: This is a digitally signed message part.
Re: [LyX master] Fix make check target
Le 05/10/2012 12:44, Kornel Benko a écrit : As of now, there is no change in cmake because cmake does not handle the checks yet. OK, thanks. JMarc
Re: trunk fails to: ./configure --without-included-boost
Le 05/10/2012 13:21, Liviu Andronic a écrit : On Fri, Oct 5, 2012 at 12:28 PM, Jean-Marc Lasgouttes> wrote: > What error do you get in config.log? > Oh, sorry. Forgot to attach the relevant files. I think that this is the relevant part: configure:7351: checking whether to use included boost library configure:7369: result: no configure:7392: g++ -o conftest -g -O -Wextra -Wall-lboost_signals -lm conftest.cpp >&5 Normally, the checks looks at both boost-signals and boost-signals-mt. Could you look later in the log file for more information? JMarc
Re: [RFC] [Patch] Rescan TeX Files on Configure
Jürgen Spitzmüller wrote: > Thus, I propose the attached patch (for trunk only). > > Objections? Since there were none, I went ahead and committed. Jürgen
Re: Tests in src/support/tests
Le 05/10/2012 12:39, Kornel Benko a écrit : I wanted to add the target makeregfiles to cmake build. But the tests (in automake) are messing the source tree, which I would like to omit in cmake build. Could they please be rewritten to work in build-tree? As this target regenerates the reference output for the tests, which live in the git repo, I do not see why they should not go to the source tree. JMarc
Re: trunk fails to: ./configure --without-included-boost
On Fri, Oct 5, 2012 at 3:04 PM, Jean-Marc Lasgoutteswrote: > Normally, the checks looks at both boost-signals and boost-signals-mt. > > Could you look later in the log file for more information? > Indeed, I missed this one: configure:7409: g++ -o conftest -g -O -Wextra -Wall-lboost_signals-mt -lm conftest.cpp >&5 /tmp/ccV8BYrI.o: In function `~signal0': /usr/include/boost/signals/signal_template.hpp:139: undefined reference to `boost::signals::trackable::~trackable()' /usr/include/boost/signals/signal_template.hpp:139: undefined reference to `boost::signals::detail::signal_base::~signal_base()' /tmp/ccV8BYrI.o: In function `~signal': /usr/include/boost/signals/signal_template.hpp:139: undefined reference to `boost::signals::detail::signal_base::~signal_base()' /tmp/ccV8BYrI.o: In function `signal0': /usr/include/boost/signals/signal_template.hpp:197: undefined reference to `boost::signals::detail::signal_base::signal_base(boost::function2 const&, boost::any const&)' collect2: ld returned 1 exit status configure:7409: $? = 1 configure: failed program was: | /* confdefs.h */ | #define PACKAGE_NAME "LyX" | #define PACKAGE_TARNAME "lyx" | #define PACKAGE_VERSION "2.1.0dev" | #define PACKAGE_STRING "LyX 2.1.0dev" | #define PACKAGE_BUGREPORT "lyx-devel@lists.lyx.org" | #define PACKAGE_URL "" | #define DEVEL_VERSION 1 | #define USE_POSIX_PACKAGING 1 | #define PACKAGE "lyx" | #define STDC_HEADERS 1 | #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_STAT_H 1 | #define HAVE_STDLIB_H 1 | #define HAVE_STRING_H 1 | #define HAVE_MEMORY_H 1 | #define HAVE_STRINGS_H 1 | #define HAVE_INTTYPES_H 1 | #define HAVE_STDINT_H 1 | #define HAVE_UNISTD_H 1 | #define ENABLE_ASSERTIONS 1 | #define _GLIBCXX_DEBUG 1 | #define _GLIBCXX_DEBUG_PEDANTIC 1 | #define _GLIBCXX_CONCEPT_CHECKS 1 | /* end confdefs.h. */ | #include | int | main () | { | boost::signal s; | ; | return 0; | } And here's the full log: http://s000.tinyupload.com/index.php?file_id=58601548012274014346=cisco Any hints there on what's wrong? Liviu
Re: Re: [LyX master] Fix make check target
Am Freitag, 5. Oktober 2012 um 14:59:57, schrieb Jean-Marc Lasgouttes> Le 05/10/2012 12:44, Kornel Benko a écrit : > > As of now, there is no change in cmake because cmake does not handle the > > checks yet. > > OK, thanks. > > JMarc Now it does. Kornel signature.asc Description: This is a digitally signed message part.
BeginLabelType/BeginLabelString Feature request.
I would like to request and also sponsor a new feature for LyX. I propose the addition to styles entitled "BeginLabelType" and "BeginLabelString" that would behave similar to "EndLabelType" and "EndLabelString" but would place the label at the beginning of the paragraph (or sequence of paragraphs if LatexType is Environment, Item_Environment or List_Environment). I will sponsor $100 towards this feature. Kind regards, John.
Re: Re: Tests in src/support/tests
Am Freitag, 5. Oktober 2012 um 15:17:07, schrieb Jean-Marc Lasgouttes> Le 05/10/2012 12:39, Kornel Benko a écrit : > > I wanted to add the target makeregfiles to cmake build. > > But the tests (in automake) are messing the source tree, which I would like > > to omit in cmake build. > > > > Could they please be rewritten to work in build-tree? > > As this target regenerates the reference output for the tests, which > live in the git repo, I do not see why they should not go to the source > tree. > > JMarc The target makeregfiles creates ${srcdir}/tests/regfiles/check_{convert,filetools,lstrings} Kornel signature.asc Description: This is a digitally signed message part.
Re: BeginLabelType/BeginLabelString Feature request.
On 10/05/2012 11:06 AM, John Carbone wrote: I would like to request and also sponsor a new feature for LyX. I propose the addition to styles entitled “BeginLabelType” and “BeginLabelString” that would behave similar to “EndLabelType” and “EndLabelString” but would place the label at the beginning of the paragraph (or sequence of paragraphs if LatexType is Environment, Item_Environment or List_Environment). I will sponsor $100 towards this feature. Please file this as an enhancement bug. Also, please be aware that this could only be done for LyX 2.1.0, since it would be a file format change. Richard
Re: Tests in src/support/tests
Le 05/10/2012 17:08, Kornel Benko a écrit : > As this target regenerates the reference output for the tests, which > live in the git repo, I do not see why they should not go to the source > tree. The target makeregfiles creates ${srcdir}/tests/regfiles/check_{convert,filetools,lstrings} Indeed. But is it a problem? JMarc
Re: Re: Tests in src/support/tests
Am Freitag, 5. Oktober 2012 um 17:45:18, schrieb Jean-Marc Lasgouttes> Le 05/10/2012 17:08, Kornel Benko a écrit : > > > As this target regenerates the reference output for the tests, which > > > live in the git repo, I do not see why they should not go to the source > > > tree. > > > > The target makeregfiles creates > > ${srcdir}/tests/regfiles/check_{convert,filetools,lstrings} > > Indeed. But is it a problem? > > JMarc No, cosmetics reasons only. Nothing should mess source tree if one wants to build outside the source. This way there may be any number of build trees (each different configured). Kornel signature.asc Description: This is a digitally signed message part.
Re: Tests in src/support/tests
Le 05/10/2012 17:50, Kornel Benko a écrit : No, cosmetics reasons only. Nothing should mess source tree if one wants to build outside the source. This way there may be any number of build trees (each different configured). I'd say that _some_ special make target can be intended to modify the source code. This is already the case of the update-po rule in po/ directory. JMarc
Re: [LyX master] Prevent the PreviewLoader from orphaning children
Richard, this needs to go to branch as well, as an addition to 2f3acae9. Jürgen Am Freitag 05 Oktober 2012, 18:28:44 schrieb Juergen Spitzmueller: > The branch, master, has been updated. > > - Log - > > commit e6afdf1b2b1f707a69ac5b2ddb9056443b0a89b4 > Author: Juergen Spitzmueller> Date: Fri Oct 5 18:28:38 2012 +0200 > > Prevent the PreviewLoader from orphaning children > > diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp > index 6185681..433082b 100644 > --- a/src/graphics/PreviewLoader.cpp > +++ b/src/graphics/PreviewLoader.cpp > @@ -716,6 +716,8 @@ void PreviewLoader::Impl::dumpPreamble(otexstream & os) > const runparams.nice = true; > runparams.moving_arg = true; > runparams.free_spacing = true; > + if (buffer_.parent()) > + runparams.is_child = true; > buffer_.writeLaTeXSource(os, buffer_.filePath(), runparams, > Buffer::OnlyPreamble); > > // FIXME! This is a HACK! The proper fix is to control the 'true' > > --- > > Summary of changes: > src/graphics/PreviewLoader.cpp |2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > > hooks/post-receive
Re: [LyX master] Prevent the PreviewLoader from orphaning children
Jürgen Spitzmüller wrote: > Richard, this needs to go to branch as well, as an addition to 2f3acae9. No, sorry. Actually, it's (only) this that needs to go to branch also. dumpPreamble() exits after the preamble, so we need to restore the parenthood there: commit 63612ca99b4961c5997c788626da81553233ff9f Author: Juergen SpitzmuellerDate: Fri Oct 5 19:26:07 2012 +0200 Restore buffer parenthood if we exit already after the preamble diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 3561c45..8b052ad 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -1592,8 +1592,12 @@ void Buffer::writeLaTeXSource(otexstream & os, runparams.use_japanese = features.isRequired("japanese"); - if (!output_body) + if (!output_body) { + // Restore the parenthood if needed + if (!runparams.is_child) + d->ignore_parent = false; return; + } // make the body. os << "\\begin{document}\n"; OK? Jürgen
Re: [LyX master] Fix make check target
Jean-Marc Lasgouttes wrote: > Pavel, if this satisfies you, I will port to branch. Works here. Pavel
Re: [LyX master] Merge branch 'master' of git.lyx.org:lyx
Juergen Spitzmueller wrote: > commit 2fa840b7716f5907362a1457b5ed189e675cfb57 > Author: Juergen Spitzmueller> Date: Fri Oct 5 09:59:44 2012 +0200 > > Do not let the children's buffer params leak into the master (#5941) Thanks Juergen. Pavel
Re: Re: Re: trunk fails to: ./configure --without-included-boost
On Fri, Oct 5, 2012 at 2:50 PM, Kornel Benkowrote: > I, too have Precise ..., so this should not be the reason. > > > several liboost 1.40.0 libraries laying around. > > I have too, so no problem either ... > Hmm, but does it work when you use autotools instead of cmake? Liviu
Re: [PATCH] lyxknitr failed when /tmp on different fs
Are these patches OK for trunk and branch? Thanks, Scott On Tue, Oct 2, 2012 at 6:34 AM, Scott Kostyshakwrote: > On Mon, Oct 1, 2012 at 9:43 AM, Richard Heck wrote: >> On 10/01/2012 04:04 AM, Jean-Marc Lasgouttes wrote: >>> >>> Le 01/10/2012 08:56, Scott Kostyshak a écrit : On Mon, Oct 1, 2012 at 2:46 AM, Yihui Xie wrote: > > I have tested it on my Windows 7 and I did not see any problems. Great, thanks for doing that Yihui. In that case, the question becomes -- should this be committed only to trunk? I would be in favor of committing it to branch, but I'm not sure if it's best to do that before or after 2.0.5 is released. Anyone else have an opinion? >>> >>> >>> I think it should go to trunk and branch: is is simpler now (always good) >>> and I trust that Yihui tested it thoroughly. >>> >> Good for branch, then. >> >> Scott, you know about status.20x, yes? > > I do, but I would have forgotten to update it. Thank you for the reminder. > > Attached are the patches for trunk and branch. Are they OK? > > Thanks, > > Scott