r24986 by craig - Add build time hunspell version info as it doesn't look like there's a

[scribus-commit]

Author: craig
Date: Wed Mar  2 22:53:52 2022
New Revision: 24986

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24986
Log:
Add build time hunspell version info as it doesn't look like there's a
runtime version

Modified:
    trunk/Scribus/CMakeLists_Dependencies.cmake
    trunk/Scribus/config.h.cmake
    trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldict.cpp
    trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldict.h
    trunk/Scribus/scribus/ui/about.cpp

Modified: trunk/Scribus/CMakeLists_Dependencies.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24986&path=/trunk/Scribus/CMakeLists_Dependencies.cmake
==============================================================================
--- trunk/Scribus/CMakeLists_Dependencies.cmake	(original)
+++ trunk/Scribus/CMakeLists_Dependencies.cmake	Wed Mar  2 22:53:52 2022
@@ -175,8 +175,9 @@
 #<<HUNSPELL for Spelling support
 find_package(hunspell REQUIRED)
 if (hunspell_FOUND)
-	message("hunspell Found OK")
+	message("hunspell Found OK ${hunspell_VERSION}")
 	set(HAVE_HUNSPELL ON)
+	set(HUNSPELL_VERSION ${hunspell_VERSION})
 else()
 	message("hunspell or its developer libraries NOT found - Disabling support for spell checking")
 endif()

Modified: trunk/Scribus/config.h.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24986&path=/trunk/Scribus/config.h.cmake
==============================================================================
--- trunk/Scribus/config.h.cmake	(original)
+++ trunk/Scribus/config.h.cmake	Wed Mar  2 22:53:52 2022
@@ -32,6 +32,8 @@
 #cmakedefine HAVE_SYS_TYPES_H 1
 #cmakedefine HAVE_TIFF 1
 #cmakedefine HAVE_XML 1
+#cmakedefine HUNSPELL_VERSION "@HUNSPELL_VERSION@"
+#cmakedefine HAVE_HUNSPELL "@HAVE_HUNSPELL@"
 #cmakedefine HUNSPELL_NEWAPI "@HUNSPELL_NEWAPI@"
 #cmakedefine WITH_TESTS 1
 #cmakedefine WORDS_BIGENDIAN 1

Modified: trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldict.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24986&path=/trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldict.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldict.cpp	(original)
+++ trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldict.cpp	Wed Mar  2 22:53:52 2022
@@ -9,15 +9,13 @@
 
 #include <hunspell/hunspell.hxx>
 #include <QDebug>
+#include <QString>
 #include <QTextCodec>
 
 #include "scconfig.h"
 
 HunspellDict::HunspellDict(const QString& affPath, const QString& dictPath)
 {
-	m_hunspell = nullptr;
-	m_codec = nullptr;
-
 	QString encoding = "ISO8859-1";
 	m_hunspell = new Hunspell(affPath.toLocal8Bit().constData(), dictPath.toLocal8Bit().constData());
 	if (m_hunspell)

Modified: trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldict.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24986&path=/trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldict.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldict.h	(original)
+++ trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldict.h	Wed Mar  2 22:53:52 2022
@@ -24,8 +24,8 @@
 	QStringList suggest(const QString& word);
 
 protected:
-	Hunspell*   m_hunspell;
-	QTextCodec* m_codec;
+	Hunspell* m_hunspell {nullptr};
+	QTextCodec* m_codec {nullptr};
 };
 
 #endif

Modified: trunk/Scribus/scribus/ui/about.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24986&path=/trunk/Scribus/scribus/ui/about.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/about.cpp	(original)
+++ trunk/Scribus/scribus/ui/about.cpp	Wed Mar  2 22:53:52 2022
@@ -680,9 +680,14 @@
 	buildText.append("</p><p>");
 	buildText.append(tr("cairo: %1").arg(CAIRO_VERSION_STRING));
 	buildText.append("<br>");
-	buildText.append(tr("Harfbuzz: %1").arg(HB_VERSION_STRING));
+	buildText.append(tr("harfbuzz: %1").arg(HB_VERSION_STRING));
 	buildText.append("<br>");
-	buildText.append(tr("littlcms: %1").arg(LCMS_VERSION));
+//note this is detected from cmake  at build time
+#ifdef HAVE_HUNSPELL
+	buildText.append(tr("hunspell: %1 (detected at build time)").arg(HUNSPELL_VERSION));
+	buildText.append("<br>");
+#endif
+	buildText.append(tr("littlecms: %1").arg(LCMS_VERSION));
 	buildText.append("<br>");
 	QString podofoVersion;
 #ifdef HAVE_PODOFO