tmispell-glibmm.patch

   1 --- tmispell-rel-0.5.0/configure.ac.orig        2009-02-10 17:08:13.000000000 +0100
   2 +++ tmispell-rel-0.5.0/configure.ac     2017-04-15 23:07:29.326418125 +0200
   3 @@ -72,6 +72,7 @@ AC_SEARCH_LIBS(initscr, ncurses curses,
   4                         Do you have Ncurses installed?])])
   5
   6  PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.0.0)
   7 +PKG_CHECK_MODULES(GLIBMM, glibmm-2.4 >= 2.4.0)
   8
   9  dnl ## Config file
  10  if test "x${sysconfdir}" = 'x${prefix}/etc'; then
  11 --- tmispell-rel-0.5.0/enchant/voikko_provider.cc.orig  2009-02-10 17:08:13.000000000 +0100
  12 +++ tmispell-rel-0.5.0/enchant/voikko_provider.cc       2017-04-15 23:15:31.759745946 +0200
  13 @@ -253,13 +253,13 @@ voikko_provider_dispose (EnchantProvider
  14         ::g_free (me);
  15  }
  16
  17 -static char *
  18 +static const char *
  19  voikko_provider_identify (EnchantProvider * me)
  20  {
  21         return "voikko";
  22  }
  23
  24 -static char *
  25 +static const char *
  26  voikko_provider_describe (EnchantProvider * me)
  27  {
  28         return "Voikko Provider";
  29 --- tmispell-rel-0.5.0/src/Makefile.am.orig     2009-02-10 17:08:13.000000000 +0100
  30 +++ tmispell-rel-0.5.0/src/Makefile.am  2017-04-15 23:06:57.813085150 +0200
  31 @@ -1,15 +1,9 @@
  32 -INCLUDES=$(GLIB_CFLAGS) -Iglibmm
  33 -
  34 -USTRING_SOURCES = glibmm/convert.h glibmm/error.h glibmm/exception.h glibmm/unicode.h \
  35 -                  glibmm/ustring.h glibmm/utility.h glibmm/convert.cc glibmm/error.cc \
  36 -                  glibmm/exception.cc glibmm/glibmmconfig.h glibmm/unicode.cc glibmm/ustring.cc \
  37 -                  glibmm/private/convert_p.h glibmm/private/unicode_p.h
  38 -
  39 +INCLUDES=$(GLIB_CFLAGS) $(GLIBMM_CFLAGS)
  40
  41  MAINTAINERCLEANFILES =  Makefile.in .deps config.hh config.hh.in stamp-h.in
  42
  43  bin_PROGRAMS = tmispell
  44 -tmispell_LDADD = @INTLLIBS@ $(GLIB_LIBS)
  45 +tmispell_LDADD = @INTLLIBS@ $(GLIBMM_LIBS) $(GLIB_LIBS)
  46  tmispell_SOURCES =     \
  47         charset.hh      \
  48         charset.cc      \
  49 @@ -41,8 +35,7 @@ tmispell_SOURCES =    \
  50         tmispell.hh     \
  51         spell.cc        \
  52         spell.hh        \
  53 -       voikko.hxx \
  54 -       $(USTRING_SOURCES)
  55 +       voikko.hxx
  56
  57  #### Debug
  58  ####
  59 --- tmispell-rel-0.5.0/src/options.cc.orig      2009-02-10 17:08:13.000000000 +0100
  60 +++ tmispell-rel-0.5.0/src/options.cc   2017-04-15 23:10:35.616415996 +0200
  61 @@ -21,6 +21,7 @@
  62   *
  63   * Parse command line options and assume sensible defaults.
  64   */
  65 +#include <cstring>
  66  #include <string>
  67  #include <iostream>
  68  #include <sstream>
  69 --- tmispell-rel-0.5.0/enchant/Makefile.am.orig 2009-02-10 17:08:13.000000000 +0100
  70 +++ tmispell-rel-0.5.0/enchant/Makefile.am      2017-04-16 07:26:51.886076004 +0200
  71 @@ -2,19 +2,11 @@
  72
  73  target_lib = libenchant_voikko.la
  74
  75 -INCLUDES=-I$(top_srcdir)/src $(ENCHANT_CFLAGS)
  76 +INCLUDES=-I$(top_srcdir)/src $(ENCHANT_CFLAGS) $(GLIBMM_CFLAGS)
  77
  78  voikko_LTLIBRARIES = $(target_lib)
  79  voikkodir = $(libdir)/enchant
  80
  81 -USTRING_SOURCES = \
  82 -        $(top_srcdir)/src/glibmm/convert.cc \
  83 -        $(top_srcdir)/src/glibmm/exception.cc \
  84 -        $(top_srcdir)/src/glibmm/error.cc \
  85 -        $(top_srcdir)/src/glibmm/unicode.cc \
  86 -        $(top_srcdir)/src/glibmm/ustring.cc \
  87 -        $(top_srcdir)/src/glibmm/utility.cc
  88 -
  89  TMISPELL_SOURCES = \
  90         $(top_srcdir)/src/charset.cc \
  91         $(top_srcdir)/src/charset.hh \
  92 @@ -31,8 +23,8 @@
  93         $(top_srcdir)/src/tmerror.cc \
  94         $(top_srcdir)/src/tmerror.hh
  95
  96 -libenchant_voikko_la_LIBADD= $(ENCHANT_LIBS) $(ENCHANT_LIBS)
  97 +libenchant_voikko_la_LIBADD= $(ENCHANT_LIBS) $(GLIBMM_LIBS)
  98  libenchant_voikko_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined
  99  libenchant_voikko_la_SOURCES = \
 100 -       voikko_provider.cc $(TMISPELL_SOURCES) $(USTRING_SOURCES)
 101 +       voikko_provider.cc $(TMISPELL_SOURCES)
 102  libenchant_voikko_lalibdir=$(libdir)/enchant