From owner-svn-ports-all@freebsd.org Sat Nov 26 12:31:17 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 026DEC554AC; Sat, 26 Nov 2016 12:31:17 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B7CFB698; Sat, 26 Nov 2016 12:31:16 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAQCVFp4094235; Sat, 26 Nov 2016 12:31:15 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAQCVFTN094233; Sat, 26 Nov 2016 12:31:15 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611261231.uAQCVFTN094233@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 26 Nov 2016 12:31:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427163 - head/print/scribus/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Nov 2016 12:31:17 -0000 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); + }