svn commit: r459568 - head/editors/plume-creator-devel/files

[Jan Beich]

Author: jbeich
Date: Sun Jan 21 02:23:24 2018
New Revision: 459568
URL: https://svnweb.freebsd.org/changeset/ports/459568

Log:
  editors/plume-creator-devel: unbreak build with Clang 6 (C++14 by default)
  
  In file included from externals/hunspell/affixmgr.cxx:12:
  externals/hunspell/affentry.hxx:30:94: error: cannot initialize a parameter of type 'unsigned short' with an rvalue of type 'nullptr_t'
    struct hentry *      check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL);
                                                                                               ^          ~~~~
  externals/hunspell/affentry.hxx:30:94: note: passing argument to parameter 'needflag' here
  externals/hunspell/affentry.hxx:93:103: error: cannot initialize a parameter of type 'unsigned short' with an rvalue of type 'nullptr_t'
    struct hentry *   check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = NULL);
                                                                                                        ^          ~~~~
  
  Reported by:	pkg-fallout
  Obtained from:	upstream (Hunspell 1.4.0)

Added:
  head/editors/plume-creator-devel/files/patch-externals_hunspell_affentry.hxx   (contents, props changed)

Added: head/editors/plume-creator-devel/files/patch-externals_hunspell_affentry.hxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/plume-creator-devel/files/patch-externals_hunspell_affentry.hxx	Sun Jan 21 02:23:24 2018	(r459568)
@@ -0,0 +1,27 @@
+https://github.com/hunspell/hunspell/commit/be3b8d945a25
+https://github.com/hunspell/hunspell/commit/dd3a71c38b61
+
+--- externals/hunspell/affentry.hxx.orig	2015-05-10 16:46:22 UTC
++++ externals/hunspell/affentry.hxx
+@@ -27,7 +27,7 @@ class LIBHUNSPELL_DLL_EXPORTED PfxEntry : protected Af
+   struct hentry *      checkword(const char * word, int len, char in_compound, 
+                             const FLAG needflag = FLAG_NULL);
+ 
+-  struct hentry *      check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL);
++  struct hentry *      check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = FLAG_NULL);
+ 
+   char *      check_morph(const char * word, int len, char in_compound,
+                             const FLAG needflag = FLAG_NULL);
+@@ -87,10 +87,9 @@ class LIBHUNSPELL_DLL_EXPORTED SfxEntry : protected Af
+   inline bool          allowCross() { return ((opts & aeXPRODUCT) != 0); }
+   struct hentry *   checkword(const char * word, int len, int optflags, 
+                     PfxEntry* ppfx, char ** wlst, int maxSug, int * ns,
+-//                    const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, char in_compound=IN_CPD_NOT);
+-                    const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = 0);
++                    const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = FLAG_NULL);
+ 
+-  struct hentry *   check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = NULL);
++  struct hentry *   check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = FLAG_NULL);
+ 
+   char *      check_twosfx_morph(const char * word, int len, int optflags,
+                  PfxEntry* ppfx, const FLAG needflag = FLAG_NULL);