Compilation with Autotools and Qt5

2015-01-04 Thread Vincent van Ravesteijn

Hi all,

Apparently we need to append the following arguments to configure to be 
able to compile with qt5 and autotools (already discussed in 
https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg185551.html):


configure --enable-qt5 CPPFLAGS=-fPIC --disable-concept-checks

Should we make this the default then ?

Vincent




Re: Compilation with Autotools and Qt5

2015-01-04 Thread Stephan Witt
Am 04.01.2015 um 12:18 schrieb Vincent van Ravesteijn v...@lyx.org:

 Hi all,
 
 Apparently we need to append the following arguments to configure to be able 
 to compile with qt5 and autotools (already discussed in 
 https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg185551.html):
 
 configure --enable-qt5 CPPFLAGS=-fPIC --disable-concept-checks
 
 Should we make this the default then ?

Yes, IMHO. BTW, do you understand why it is a problem?

Stephan

Re: Retina support

2015-01-04 Thread Stephan Witt
Am 27.12.2014 um 05:26 schrieb Richard Heck rgh...@lyx.org:

 On 12/26/2014 06:45 PM, Christopher Menzel wrote:
 LyX folk:
 
 I have a couple of questions concerning LyX on the new 5k iMac.
 
 1. Stephan Witt had noted some time ago that Retina support was in 
 development for LyX. Does anyone have a reasonable sense of the ETA for such 
 support in an OS X binary?
 
 I think this exists in the development branch., but Stephan knows for sure.

The development branch basically has retina support. 
The unsolved issues regarding HiDPI screens are:
1. The required Qt5-frameworks have some bugs on the Mac platform which 
one may see as show stoppers. (See: http://www.lyx.org/trac/ticket/9215)
2. The icons for LyX are not ready for high resolution displays.

I'd like to discuss the chances to make this productive somehow.
I can spend some time to work on the icon issue. And I'll follow
the changes of the Qt5-frameworks (Qt5.4.0 is available now).

Is it possible to make a 2.2 release in a foreseeable future?
Or would it be possible to do a back port of Qt5- and Retina-support to 2.1.x?
What's LyX behavior on other platforms regarding HiDPI screens?

Best wishes for a happy New Year to all.
Stephan

LyX 2.1.3?

2015-01-04 Thread Richard Heck


It has been a few months since 2.1.2, and we have fixed a number of bugs 
since then. So I'm thinking about freezing strings in maybe a week.


What bugs need to be fixed for this release? I'd like to try to fix the 
recent outliner bug #9375 for 2.1.3 and should be able to do so this 
week, and it shouldn't involve any string changes, anyway. Others?


Richard



Re: Compilation with Autotools and Qt5

2015-01-04 Thread Enrico Forestieri
On Sun, Jan 04, 2015 at 01:49:38PM +0100, Stephan Witt wrote:
 Am 04.01.2015 um 12:18 schrieb Vincent van Ravesteijn v...@lyx.org:
 
  Hi all,
  
  Apparently we need to append the following arguments to configure to be
  able to compile with qt5 and autotools (already discussed in
  https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg185551.html):
  
  configure --enable-qt5 CPPFLAGS=-fPIC --disable-concept-checks
  
  Should we make this the default then ?
 
 Yes, IMHO.

Done at dd2a8b61.

 BTW, do you understand why it is a problem?

No, but most probably it is due to heavy STL usage.

-- 
Enrico


Re: LyX 2.1.3?

2015-01-04 Thread Jürgen Spitzmüller
Richard Heck wrote:
 What bugs need to be fixed for this release? I'd like to try to fix the
 recent outliner bug #9375 for 2.1.3 and should be able to do so this
 week, and it shouldn't involve any string changes, anyway. Others?

I guess Uwe wants to address his concerns with babel-lang on MikTeX (#9370).

Enrico has also committed some fixes that might be considered for backporting 
(#7970, #9319, #9342). Nothing critical, though.

Jürgen



Re: LyX 2.1.3?

2015-01-04 Thread Richard Heck

On 01/04/2015 12:18 PM, Jürgen Spitzmüller wrote:

Richard Heck wrote:

What bugs need to be fixed for this release? I'd like to try to fix the
recent outliner bug #9375 for 2.1.3 and should be able to do so this
week, and it shouldn't involve any string changes, anyway. Others?

I guess Uwe wants to address his concerns with babel-lang on MikTeX (#9370).


Yes, I'm waiting to hear from him about how long that will take.


Enrico has also committed some fixes that might be considered for backporting
(#7970, #9319, #9342). Nothing critical, though.


If you think those are safe, Enrico, then you should go ahead.

Richard



Re: LyX 2.1.3?

2015-01-04 Thread Georg Baum
Richard Heck wrote:

 It has been a few months since 2.1.2, and we have fixed a number of bugs
 since then. So I'm thinking about freezing strings in maybe a week.
 
 What bugs need to be fixed for this release? I'd like to try to fix the
 recent outliner bug #9375 for 2.1.3 and should be able to do so this
 week, and it shouldn't involve any string changes, anyway. Others?

I'd like to put in a minimal workaround for the export threading problems of 
bug 9336 (see attachment). OK?


Georgdiff --git a/src/Language.cpp b/src/Language.cpp
index e6f7f9e..6b624fc 100644
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -38,6 +38,12 @@ Language const * latex_language = 0;
 Language const * reset_language = 0;
 
 
+std::string const Language::babel() const
+{
+	return deep_copy(babel_);
+}
+
+
 bool Language::isPolyglossiaExclusive() const
 {
 	return babel().empty()  !polyglossia().empty()  requires().empty();
diff --git a/src/Language.h b/src/Language.h
index c912326..79b4098 100644
--- a/src/Language.h
+++ b/src/Language.h
@@ -35,7 +35,7 @@ public:
 	/// LyX language name
 	std::string const  lang() const { return lang_; }
 	/// Babel language name
-	std::string const  babel() const { return babel_; }
+	std::string const babel();
 	/// polyglossia language name
 	std::string const  polyglossia() const { return polyglossia_name_; }
 	/// polyglossia language options
diff --git a/src/support/lstrings.h b/src/support/lstrings.h
index 20a73c4..3a69df4 100644
--- a/src/support/lstrings.h
+++ b/src/support/lstrings.h
@@ -24,6 +24,19 @@
 namespace lyx {
 namespace support {
 
+/// Helper to enforce creating a deep copy of lyx::docstring or std::string
+/// even if std::basic_string uses copy-on-write as in GNU libstdc++.
+/// \sa https://gcc.gnu.org/bugzilla/show_bug.cgi?id=21334
+templatetypename Char, typename Traits, typename Alloc
+typename std::basic_stringChar, Traits, Alloc
+deep_copy(typename std::basic_stringChar, Traits, Alloc const  src)
+{
+	typedef typename std::basic_stringChar, Traits, Alloc String;
+	// Use constructor with two arguments to support strings with embedded
+	// \0 characters
+	return String(src.c_str(), src.length());
+}
+
 /// Compare \p s and \p s2, ignoring the case.
 /// Does not depend on the locale.
 int compare_no_case(docstring const  s, docstring const  s2);



Re: LyX 2.1.3?

2015-01-04 Thread Stephan Witt
Am 04.01.2015 um 16:45 schrieb Richard Heck rgh...@lyx.org:

 
 It has been a few months since 2.1.2, and we have fixed a number of bugs 
 since then. So I'm thinking about freezing strings in maybe a week.
 
 What bugs need to be fixed for this release? I'd like to try to fix the 
 recent outliner bug #9375 for 2.1.3 and should be able to do so this week, 
 and it shouldn't involve any string changes, anyway. Others?

I'd like to improve the build script to make it more similar to master.

Stephan



patch.diff
Description: Binary data


Re: LyX 2.1.3?

2015-01-04 Thread Richard Heck

On 01/04/2015 03:31 PM, Stephan Witt wrote:

Am 04.01.2015 um 16:45 schrieb Richard Heck rgh...@lyx.org:


It has been a few months since 2.1.2, and we have fixed a number of bugs since 
then. So I'm thinking about freezing strings in maybe a week.

What bugs need to be fixed for this release? I'd like to try to fix the recent 
outliner bug #9375 for 2.1.3 and should be able to do so this week, and it 
shouldn't involve any string changes, anyway. Others?

I'd like to improve the build script to make it more similar to master.


Totally your call, as this is OSX only, yes?

rh



Re: LyX 2.1.3?

2015-01-04 Thread Richard Heck

On 01/04/2015 02:08 PM, Georg Baum wrote:

Richard Heck wrote:


It has been a few months since 2.1.2, and we have fixed a number of bugs
since then. So I'm thinking about freezing strings in maybe a week.

What bugs need to be fixed for this release? I'd like to try to fix the
recent outliner bug #9375 for 2.1.3 and should be able to do so this
week, and it shouldn't involve any string changes, anyway. Others?

I'd like to put in a minimal workaround for the export threading problems of
bug 9336 (see attachment). OK?


OK. This looks like a good, minimal solution for this case.

rh



Compilation with Autotools and Qt5

2015-01-04 Thread Vincent van Ravesteijn

Hi all,

Apparently we need to append the following arguments to configure to be 
able to compile with qt5 and autotools (already discussed in 
https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg185551.html):


configure --enable-qt5 CPPFLAGS=-fPIC --disable-concept-checks

Should we make this the default then ?

Vincent




Re: Compilation with Autotools and Qt5

2015-01-04 Thread Stephan Witt
Am 04.01.2015 um 12:18 schrieb Vincent van Ravesteijn :

> Hi all,
> 
> Apparently we need to append the following arguments to configure to be able 
> to compile with qt5 and autotools (already discussed in 
> https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg185551.html):
> 
> configure --enable-qt5 CPPFLAGS=-fPIC --disable-concept-checks
> 
> Should we make this the default then ?

Yes, IMHO. BTW, do you understand why it is a problem?

Stephan

Re: Retina support

2015-01-04 Thread Stephan Witt
Am 27.12.2014 um 05:26 schrieb Richard Heck :

> On 12/26/2014 06:45 PM, Christopher Menzel wrote:
>> LyX folk:
>> 
>> I have a couple of questions concerning LyX on the new 5k iMac.
>> 
>> 1. Stephan Witt had noted some time ago that Retina support was in 
>> development for LyX. Does anyone have a reasonable sense of the ETA for such 
>> support in an OS X binary?
> 
> I think this exists in the development branch., but Stephan knows for sure.

The development branch basically has retina support. 
The unsolved issues regarding HiDPI screens are:
1. The required Qt5-frameworks have some bugs on the Mac platform which 
one may see as show stoppers. (See: http://www.lyx.org/trac/ticket/9215)
2. The icons for LyX are not ready for high resolution displays.

I'd like to discuss the chances to make this productive somehow.
I can spend some time to work on the icon issue. And I'll follow
the changes of the Qt5-frameworks (Qt5.4.0 is available now).

Is it possible to make a 2.2 release in a foreseeable future?
Or would it be possible to do a back port of Qt5- and Retina-support to 2.1.x?
What's LyX behavior on other platforms regarding HiDPI screens?

Best wishes for a happy New Year to all.
Stephan

LyX 2.1.3?

2015-01-04 Thread Richard Heck


It has been a few months since 2.1.2, and we have fixed a number of bugs 
since then. So I'm thinking about freezing strings in maybe a week.


What bugs need to be fixed for this release? I'd like to try to fix the 
recent outliner bug #9375 for 2.1.3 and should be able to do so this 
week, and it shouldn't involve any string changes, anyway. Others?


Richard



Re: Compilation with Autotools and Qt5

2015-01-04 Thread Enrico Forestieri
On Sun, Jan 04, 2015 at 01:49:38PM +0100, Stephan Witt wrote:
> Am 04.01.2015 um 12:18 schrieb Vincent van Ravesteijn :
> 
> > Hi all,
> > 
> > Apparently we need to append the following arguments to configure to be
> > able to compile with qt5 and autotools (already discussed in
> > https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg185551.html):
> > 
> > configure --enable-qt5 CPPFLAGS=-fPIC --disable-concept-checks
> > 
> > Should we make this the default then ?
> 
> Yes, IMHO.

Done at dd2a8b61.

> BTW, do you understand why it is a problem?

No, but most probably it is due to heavy STL usage.

-- 
Enrico


Re: LyX 2.1.3?

2015-01-04 Thread Jürgen Spitzmüller
Richard Heck wrote:
> What bugs need to be fixed for this release? I'd like to try to fix the
> recent outliner bug #9375 for 2.1.3 and should be able to do so this
> week, and it shouldn't involve any string changes, anyway. Others?

I guess Uwe wants to address his concerns with babel-lang on MikTeX (#9370).

Enrico has also committed some fixes that might be considered for backporting 
(#7970, #9319, #9342). Nothing critical, though.

Jürgen



Re: LyX 2.1.3?

2015-01-04 Thread Richard Heck

On 01/04/2015 12:18 PM, Jürgen Spitzmüller wrote:

Richard Heck wrote:

What bugs need to be fixed for this release? I'd like to try to fix the
recent outliner bug #9375 for 2.1.3 and should be able to do so this
week, and it shouldn't involve any string changes, anyway. Others?

I guess Uwe wants to address his concerns with babel-lang on MikTeX (#9370).


Yes, I'm waiting to hear from him about how long that will take.


Enrico has also committed some fixes that might be considered for backporting
(#7970, #9319, #9342). Nothing critical, though.


If you think those are safe, Enrico, then you should go ahead.

Richard



Re: LyX 2.1.3?

2015-01-04 Thread Georg Baum
Richard Heck wrote:

> It has been a few months since 2.1.2, and we have fixed a number of bugs
> since then. So I'm thinking about freezing strings in maybe a week.
> 
> What bugs need to be fixed for this release? I'd like to try to fix the
> recent outliner bug #9375 for 2.1.3 and should be able to do so this
> week, and it shouldn't involve any string changes, anyway. Others?

I'd like to put in a minimal workaround for the export threading problems of 
bug 9336 (see attachment). OK?


Georgdiff --git a/src/Language.cpp b/src/Language.cpp
index e6f7f9e..6b624fc 100644
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -38,6 +38,12 @@ Language const * latex_language = 0;
 Language const * reset_language = 0;
 
 
+std::string const Language::babel() const
+{
+	return deep_copy(babel_);
+}
+
+
 bool Language::isPolyglossiaExclusive() const
 {
 	return babel().empty() && !polyglossia().empty() && requires().empty();
diff --git a/src/Language.h b/src/Language.h
index c912326..79b4098 100644
--- a/src/Language.h
+++ b/src/Language.h
@@ -35,7 +35,7 @@ public:
 	/// LyX language name
 	std::string const & lang() const { return lang_; }
 	/// Babel language name
-	std::string const & babel() const { return babel_; }
+	std::string const babel();
 	/// polyglossia language name
 	std::string const & polyglossia() const { return polyglossia_name_; }
 	/// polyglossia language options
diff --git a/src/support/lstrings.h b/src/support/lstrings.h
index 20a73c4..3a69df4 100644
--- a/src/support/lstrings.h
+++ b/src/support/lstrings.h
@@ -24,6 +24,19 @@
 namespace lyx {
 namespace support {
 
+/// Helper to enforce creating a deep copy of lyx::docstring or std::string
+/// even if std::basic_string uses copy-on-write as in GNU libstdc++.
+/// \sa https://gcc.gnu.org/bugzilla/show_bug.cgi?id=21334
+template
+typename std::basic_string
+deep_copy(typename std::basic_string const & src)
+{
+	typedef typename std::basic_string String;
+	// Use constructor with two arguments to support strings with embedded
+	// \0 characters
+	return String(src.c_str(), src.length());
+}
+
 /// Compare \p s and \p s2, ignoring the case.
 /// Does not depend on the locale.
 int compare_no_case(docstring const & s, docstring const & s2);



Re: LyX 2.1.3?

2015-01-04 Thread Stephan Witt
Am 04.01.2015 um 16:45 schrieb Richard Heck :

> 
> It has been a few months since 2.1.2, and we have fixed a number of bugs 
> since then. So I'm thinking about freezing strings in maybe a week.
> 
> What bugs need to be fixed for this release? I'd like to try to fix the 
> recent outliner bug #9375 for 2.1.3 and should be able to do so this week, 
> and it shouldn't involve any string changes, anyway. Others?

I'd like to improve the build script to make it more similar to master.

Stephan



patch.diff
Description: Binary data


Re: LyX 2.1.3?

2015-01-04 Thread Richard Heck

On 01/04/2015 02:08 PM, Georg Baum wrote:

Richard Heck wrote:


It has been a few months since 2.1.2, and we have fixed a number of bugs
since then. So I'm thinking about freezing strings in maybe a week.

What bugs need to be fixed for this release? I'd like to try to fix the
recent outliner bug #9375 for 2.1.3 and should be able to do so this
week, and it shouldn't involve any string changes, anyway. Others?

I'd like to put in a minimal workaround for the export threading problems of
bug 9336 (see attachment). OK?


OK. This looks like a good, minimal solution for this case.

rh



Re: LyX 2.1.3?

2015-01-04 Thread Richard Heck

On 01/04/2015 03:31 PM, Stephan Witt wrote:

Am 04.01.2015 um 16:45 schrieb Richard Heck :


It has been a few months since 2.1.2, and we have fixed a number of bugs since 
then. So I'm thinking about freezing strings in maybe a week.

What bugs need to be fixed for this release? I'd like to try to fix the recent 
outliner bug #9375 for 2.1.3 and should be able to do so this week, and it 
shouldn't involve any string changes, anyway. Others?

I'd like to improve the build script to make it more similar to master.


Totally your call, as this is OSX only, yes?

rh