Git commit 6491d6b9cb5d72035d9436cac46acd5e7d38d383 by Nicolas Brisset. Committed on 28/03/2014 at 12:49. Pushed by brisset into branch 'master'.
Some fixes for 2.0.8 (or 2.1.0?): - installation of translation files under same prefix (I'm not sure it's needed, though - I hope it doesn't break anything) - make Messages.sh executable - Switch to DocBook 4.2 for the manual so that meinproc4 can handle it. Last update: 2005 => next step is to update the contents! - Comment out the line which makes Kst2 hang, I assume Debug::trace is not thread-safe. If someone wants to work around the issue I guess a mutex somewhere could do the trick, but for now we can also leave it like this, especially for the release. With that the user file with >38000 columns (sorghum protein) plots in ca 15s on modest hardware :-) I'll see if I can get the French translation running, but as far as I'm concerned there's nothing else I absolutely want to do prior to making a release. M +1 -1 CMakeLists.txt M +0 -0 Messages.sh M +1 -1 docbook/kst/index.docbook M +1 -1 src/datasources/ascii/asciisource.cpp http://commits.kde.org/kst-plot/6491d6b9cb5d72035d9436cac46acd5e7d38d383 diff --git a/CMakeLists.txt b/CMakeLists.txt index 2521c32..b36b56d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -394,7 +394,7 @@ if(LinguistForKst_FOUND OR Qt5LinguistForKst_FOUND) message(STATUS "Available languages: ${language_summary}") add_custom_target(qm DEPENDS ${kst_QM}) add_dependencies(${kst_binary_name} qm) - install(DIRECTORY ${CMAKE_BINARY_DIR}/locale/ DESTINATION share/kst/locale FILES_MATCHING PATTERN *.qm) + install(DIRECTORY ${CMAKE_BINARY_DIR}/locale/ DESTINATION ${kst_install_prefix}/share/kst/locale FILES_MATCHING PATTERN *.qm) else() message(STATUS "No .po files found, will not install any languages") endif() diff --git a/Messages.sh b/Messages.sh old mode 100644 new mode 100755 diff --git a/docbook/kst/index.docbook b/docbook/kst/index.docbook index 07d28aa..3b3fef7 100644 --- a/docbook/kst/index.docbook +++ b/docbook/kst/index.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> - <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!ENTITY kappname "kst"> <!ENTITY package "kdeextragear-2"> diff --git a/src/datasources/ascii/asciisource.cpp b/src/datasources/ascii/asciisource.cpp index eb4f391..a5e2329 100644 --- a/src/datasources/ascii/asciisource.cpp +++ b/src/datasources/ascii/asciisource.cpp @@ -295,7 +295,7 @@ int AsciiSource::readField(double *v, const QString& field, int s, int n) _actualField = field; updateFieldMessage(tr("Reading field: ")); - Debug::trace(QString("AsciiSource::readField() %1 s=%2 n=%3").arg(field.leftJustified(15)).arg(QString("%1").arg(s, 10)).arg(n)); +// Debug::trace(QString("AsciiSource::readField() %1 s=%2 n=%3").arg(field.leftJustified(15)).arg(QString("%1").arg(s, 10)).arg(n)); int read = tryReadField(v, field, s, n);
