svn commit: r427163 - head/print/scribus/files

[Jan Beich]

Author: jbeich
Date: Sat Nov 26 12:31:15 2016
New Revision: 427163
URL: https://svnweb.freebsd.org/changeset/ports/427163

Log:
  print/scribus: unbreak with hunspell 1.5
  
  -- Could NOT find HUNSPELL (missing:  HUNSPELL_LIBRARIES)
  HunSpell or its developer libraries NOT found - Disabling support for spell checking
  [...]
  ===> Checking for items in pkg-plist which are not in STAGEDIR
  Error: Missing: lib/scribus/plugins/libhunspellplugin.so
  
  scribus/plugins/tools/hunspellcheck/hunspelldict.cpp:22:9: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *'
                  char* dictEncoding = m_hunspell->get_dic_encoding();
                        ^              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  https://github.com/hunspell/hunspell/commit/971f8a9cf52e
  
  PR:		214837
  Approved by:	portmgr blanket

Added:
  head/print/scribus/files/patch-cmake_modules_FindHUNSPELL.cmake   (contents, props changed)
  head/print/scribus/files/patch-scribus_plugins_tools_hunspellcheck_hunspelldict.cpp   (contents, props changed)

Added: head/print/scribus/files/patch-cmake_modules_FindHUNSPELL.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/scribus/files/patch-cmake_modules_FindHUNSPELL.cmake	Sat Nov 26 12:31:15 2016	(r427163)
@@ -0,0 +1,12 @@
+--- cmake/modules/FindHUNSPELL.cmake.orig	2012-04-10 20:15:53 UTC
++++ cmake/modules/FindHUNSPELL.cmake
+@@ -9,7 +9,8 @@
+ #Based on examples at http://www.vtk.org/Wiki/CMake:How_To_Find_Libraries
+ 
+ FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx )
+-FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib )
++FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2
++  PATHS /opt/local/lib /usr/local/lib /usr/lib )
+ 
+ INCLUDE(FindPackageHandleStandardArgs)
+ # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE

Added: head/print/scribus/files/patch-scribus_plugins_tools_hunspellcheck_hunspelldict.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/scribus/files/patch-scribus_plugins_tools_hunspellcheck_hunspelldict.cpp	Sat Nov 26 12:31:15 2016	(r427163)
@@ -0,0 +1,11 @@
+--- scribus/plugins/tools/hunspellcheck/hunspelldict.cpp.orig	2012-11-20 22:49:14 UTC
++++ scribus/plugins/tools/hunspellcheck/hunspelldict.cpp
+@@ -19,7 +19,7 @@ HunspellDict::HunspellDict(const QString
+ 	m_hunspell = new Hunspell(affPath.toLocal8Bit().constData(), dictPath.toLocal8Bit().constData());
+ 	if (m_hunspell)
+ 	{
+-		char* dictEncoding = m_hunspell->get_dic_encoding();
++		const char* dictEncoding = m_hunspell->get_dic_encoding();
+ 		if (dictEncoding)
+ 			encoding = QString::fromLatin1(dictEncoding);
+ 	}