CVS commit: pkgsrc/multimedia/subtitleeditor

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Dec  2 19:17:34 UTC 2018

Modified Files:
        pkgsrc/multimedia/subtitleeditor: Makefile distinfo
Added Files:
        pkgsrc/multimedia/subtitleeditor/patches:
            patch-plugins_actions_spellchecking_spellchecking.cc
            patch-plugins_actions_spellchecking_spellchecking.h

Log Message:
Port subtitleeditor to enchant2.

Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/multimedia/subtitleeditor/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/multimedia/subtitleeditor/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/subtitleeditor/patches/patch-plugins_actions_spellchecking_spellchecking.cc \
    pkgsrc/multimedia/subtitleeditor/patches/patch-plugins_actions_spellchecking_spellchecking.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/subtitleeditor/Makefile
diff -u pkgsrc/multimedia/subtitleeditor/Makefile:1.43 pkgsrc/multimedia/subtitleeditor/Makefile:1.44
--- pkgsrc/multimedia/subtitleeditor/Makefile:1.43      Wed Nov 14 22:22:07 2018
+++ pkgsrc/multimedia/subtitleeditor/Makefile   Sun Dec  2 19:17:33 2018
@@ -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
 .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

Index: pkgsrc/multimedia/subtitleeditor/distinfo
diff -u pkgsrc/multimedia/subtitleeditor/distinfo:1.7 pkgsrc/multimedia/subtitleeditor/distinfo:1.8
--- pkgsrc/multimedia/subtitleeditor/distinfo:1.7       Thu Mar 23 17:06:56 2017
+++ pkgsrc/multimedia/subtitleeditor/distinfo   Sun Dec  2 19:17:33 2018
@@ -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) = 10
 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

Added files:

Index: pkgsrc/multimedia/subtitleeditor/patches/patch-plugins_actions_spellchecking_spellchecking.cc
diff -u /dev/null pkgsrc/multimedia/subtitleeditor/patches/patch-plugins_actions_spellchecking_spellchecking.cc:1.1
--- /dev/null   Sun Dec  2 19:17:34 2018
+++ pkgsrc/multimedia/subtitleeditor/patches/patch-plugins_actions_spellchecking_spellchecking.cc       Sun Dec  2 19:17:34 2018
@@ -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();
+ }
Index: pkgsrc/multimedia/subtitleeditor/patches/patch-plugins_actions_spellchecking_spellchecking.h
diff -u /dev/null pkgsrc/multimedia/subtitleeditor/patches/patch-plugins_actions_spellchecking_spellchecking.h:1.1
--- /dev/null   Sun Dec  2 19:17:34 2018
+++ pkgsrc/multimedia/subtitleeditor/patches/patch-plugins_actions_spellchecking_spellchecking.h        Sun Dec  2 19:17:34 2018
@@ -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;
+