Port subtitleeditor to enchant2.

Bump revision.

4 files changed, 72 insertions, 4 deletions

diff --git a/multimedia/subtitleeditor/Makefile b/multimedia/subtitleeditor/Makefile
index 736e85c51f0..bdd26973120 100644
--- a/multimedia/subtitleeditor/Makefile
+++ b/multimedia/subtitleeditor/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2018/11/14 22:22:07 kleink Exp $
+# $NetBSD: Makefile,v 1.44 2018/12/02 19:17:33 bsiegert Exp $
 
 DISTNAME=		subtitleeditor-0.30.0
-PKGREVISION=		30
+PKGREVISION=		31
 CATEGORIES=		multimedia
 #MASTER_SITES=		http://download.gna.org/subtitleeditor/0.30/
 
@@ -23,7 +23,7 @@ BUILDLINK_API_DEPENDS.glibmm+=	glibmm>=2.16.3
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-good/buildlink3.mk"
-.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/enchant2/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../textproc/libxml++/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtkmm+=	gtkmm>=2.12
diff --git a/multimedia/subtitleeditor/distinfo b/multimedia/subtitleeditor/distinfo
index d3857befea9..b35b5eac182 100644
--- a/multimedia/subtitleeditor/distinfo
+++ b/multimedia/subtitleeditor/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2017/03/23 17:06:56 joerg Exp $
+$NetBSD: distinfo,v 1.8 2018/12/02 19:17:33 bsiegert Exp $
 
 SHA1 (subtitleeditor-0.30.0.tar.gz) = bf1a2064b4c68bf21c05a095ad3f746b53da4ac8
 RMD160 (subtitleeditor-0.30.0.tar.gz) = 77cd4b22740453e986d35cbdd7335fbd5728149c
@@ -7,6 +7,8 @@ Size (subtitleeditor-0.30.0.tar.gz) = 1094597 bytes
 SHA1 (patch-aa) = b78809f0e10b76fe298edb4b4c7f995e81ee5276
 SHA1 (patch-plugins_actions_documentmanagement_documentmanagement.cc) = e16a40abe9f4418d078a7505abb0688f782912f7
 SHA1 (patch-plugins_actions_findandreplace_findandreplace_cc) = 8861c1aab7e5fd4551af2019f28cc9e735fdcfdb
+SHA1 (patch-plugins_actions_spellchecking_spellchecking.cc) = 410cc155748a9d35ccbb2870cbd46b773d11a170
+SHA1 (patch-plugins_actions_spellchecking_spellchecking.h) = 73f3f34959c2e5d37e913caf3afed98f85cfee0b
 SHA1 (patch-plugins_subtitleformats_advancedsubstationalpha_advancedsubstationalpha.cc) = 813f2890b4fb5ab8802ddb75d978b60b13c1a92e
 SHA1 (patch-plugins_subtitleformats_mpsub_mpsub.cc) = 49f23c5d1e6b8ad8fab687019280bfb2a932c3d3
 SHA1 (patch-plugins_subtitleformats_substationalpha_substationalpha.cc) = a806c0b86530144dedff2415af1df57a262715d3
diff --git a/multimedia/subtitleeditor/patches/patch-plugins_actions_spellchecking_spellchecking.cc b/multimedia/subtitleeditor/patches/patch-plugins_actions_spellchecking_spellchecking.cc
new file mode 100644
index 00000000000..69a9648be47
--- /dev/null
+++ b/multimedia/subtitleeditor/patches/patch-plugins_actions_spellchecking_spellchecking.cc
@@ -0,0 +1,43 @@
+$NetBSD: patch-plugins_actions_spellchecking_spellchecking.cc,v 1.1 2018/12/02 19:17:34 bsiegert Exp $
+
+Replace obsolete enchant API.
+
+--- plugins/actions/spellchecking/spellchecking.cc.orig	2008-11-25 12:56:14.000000000 +0000
++++ plugins/actions/spellchecking/spellchecking.cc
+@@ -169,7 +169,8 @@ DialogSpellChecking::DialogSpellChecking
+ 
+ 
+ 	// recupere la list des dicts
+-	enchant::Broker::instance()->list_dicts(callback_list_dicts, m_comboboxDicts);
++	m_broker = new enchant::Broker();
++	m_broker->list_dicts(callback_list_dicts, m_comboboxDicts);
+ 
+ 	// config dicts
+ 	Glib::ustring lang, tmp_lang;
+@@ -217,6 +218,8 @@ DialogSpellChecking::~DialogSpellCheckin
+ 	se_debug(SE_DEBUG_SPELL_CHECKING);
+ 
+ 	delete m_enchantDict;
++	delete m_broker;
++	m_broker = NULL;
+ 	m_enchantDict = NULL;
+ }
+ 
+@@ -235,7 +238,7 @@ bool DialogSpellChecking::set_dict(const
+ 
+ 	try
+ 	{
+-		m_enchantDict = enchant::Broker::instance()->request_dict(name);
++		m_enchantDict = m_broker->request_dict(name);
+ 
+ 		Config::getInstance().set_value_string("spell-checking", "lang", name);
+ 
+@@ -588,7 +591,7 @@ void DialogSpellChecking::on_add_word()
+ 	se_debug(SE_DEBUG_SPELL_CHECKING);
+ 
+ 	if(!m_current_word.empty() && m_enchantDict)
+-		m_enchantDict->add_to_pwl(m_current_word);
++		m_enchantDict->add(m_current_word);
+ 
+ 	check_next_word();
+ }
diff --git a/multimedia/subtitleeditor/patches/patch-plugins_actions_spellchecking_spellchecking.h b/multimedia/subtitleeditor/patches/patch-plugins_actions_spellchecking_spellchecking.h
new file mode 100644
index 00000000000..991d2ecd193
--- /dev/null
+++ b/multimedia/subtitleeditor/patches/patch-plugins_actions_spellchecking_spellchecking.h
@@ -0,0 +1,23 @@
+$NetBSD: patch-plugins_actions_spellchecking_spellchecking.h,v 1.1 2018/12/02 19:17:34 bsiegert Exp $
+
+Hold an instance of the enchant broker (singleton API is deprecated).
+
+--- plugins/actions/spellchecking/spellchecking.h.orig	2008-11-22 10:11:23.000000000 +0000
++++ plugins/actions/spellchecking/spellchecking.h
+@@ -38,6 +38,8 @@
+ #include <gtkmm_utility.h>
+ #include <document.h>
+ 
++class enchant::Broker;
++
+ /*
+  *
+  */
+@@ -226,6 +228,7 @@ protected:
+ 	Gtk::Button*		m_buttonIgnoreAll;
+ 	Gtk::Button*		m_buttonAddWord;
+ 
++	enchant::Broker*	m_broker;
+ 
+ 	Gtk::Label*			m_labelCompletedSpellChecking;
+