[pkgsrc/trunk]: pkgsrc/editors/dasher dasher: Update to 5.0.0.b20200225

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e791c5a6524f
branches:  trunk
changeset: 413961:e791c5a6524f
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Mar 23 12:25:38 2020 +0000

description:
dasher: Update to 5.0.0.b20200225

This brings it up to speed with gtk3, etc.

Sadly the developer of dasher passed away, so the last release published
was a beta in 2016. I can't get it to build, so this is a git snapshot.

diffstat:

 editors/dasher/Makefile                                        |   49 +-
 editors/dasher/PLIST                                           |  229 +--------
 editors/dasher/distinfo                                        |   13 +-
 editors/dasher/options.mk                                      |   35 -
 editors/dasher/patches/patch-Src_DasherCore_DasherViewSquare.h |   16 -
 editors/dasher/patches/patch-Src_DasherCore_SettingsStore.h    |   14 -
 editors/dasher/patches/patch-Src_DasherCore_View_DelayedDraw.h |   12 -
 7 files changed, 63 insertions(+), 305 deletions(-)

diffs (truncated from 515 to 300 lines):

diff -r a50785121024 -r e791c5a6524f editors/dasher/Makefile
--- a/editors/dasher/Makefile   Mon Mar 23 12:25:01 2020 +0000
+++ b/editors/dasher/Makefile   Mon Mar 23 12:25:38 2020 +0000
@@ -1,46 +1,31 @@
-# $NetBSD: Makefile,v 1.102 2020/03/10 22:09:40 wiz Exp $
+# $NetBSD: Makefile,v 1.103 2020/03/23 12:25:38 nia Exp $
 
-DISTNAME=      dasher-4.10.1
-PKGREVISION=   47
+DISTNAME=      dasher-5.0.0.b20200225
 CATEGORIES=    editors gnome
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/dasher/4.10/}
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=dasher-project/}
+GITHUB_TAG=    e03b0dbf1f1132e83645ff78c92efd63fca5a812
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.inference.phy.cam.ac.uk/dasher/
 COMMENT=       Easy typing without using keyboard
 LICENSE=       gnu-gpl-v2
 
-USE_LANGUAGES=         c c++03
-USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake intltool msgfmt pkg-config
-USE_PKGLOCALEDIR=      yes
-GNU_CONFIGURE=         yes
-
-INSTALLATION_DIRS=     ${GCONF_SCHEMAS_DIR}
+TOOL_DEPENDS+= yelp-tools-[0-9]*:../../textproc/yelp-tools
 
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
+GNU_CONFIGURE= yes
+USE_LIBTOOL=   yes
+USE_LANGUAGES= c c++
 
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
-# Needed for ftime(3).
-LIBS+=                 -lcompat
-.endif
+USE_TOOLS+=    autoreconf autoconf automake
+USE_TOOLS+=    pkg-config
 
-GCONF_SCHEMAS+=        dasher.schemas
-
-post-build:
-       cd ${WRKSRC}/Data && ../Src/Gtk2/generate-schema >dasher.schemas
-
-post-install:
-       ${INSTALL_DATA} ${WRKSRC}/Data/dasher.schemas ${DESTDIR}${GCONF_SCHEMAS_DIR}
+pre-configure:
+       # tries to invoke git for something, probably fetching the ref
+       ${ECHO} "true" > ${WRKSRC}/build-aux/mkversion
+       cd ${WRKSRC} && autoreconf -fi
 
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf/schemas.mk"
-.include "../../devel/libglade/buildlink3.mk"
+.include "../../audio/speech-dispatcher/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+=   gtk2+>=2.8.0
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libXtst/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a50785121024 -r e791c5a6524f editors/dasher/PLIST
--- a/editors/dasher/PLIST      Mon Mar 23 12:25:01 2020 +0000
+++ b/editors/dasher/PLIST      Mon Mar 23 12:25:38 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2010/01/22 19:55:07 ghen Exp $
+@comment $NetBSD: PLIST,v 1.25 2020/03/23 12:25:38 nia Exp $
 bin/dasher
 man/man1/dasher.1
 share/applications/dasher.desktop
@@ -61,13 +61,13 @@
 share/dasher/alphabet.arabic.xml
 share/dasher/alphabet.basque.xml
 share/dasher/alphabet.bengali.xml
+share/dasher/alphabet.bopoTrad.xml
 share/dasher/alphabet.bopomofo.xml
 share/dasher/alphabet.bosnian.xml
 share/dasher/alphabet.breton.xml
+share/dasher/alphabet.cangjie.xml
 share/dasher/alphabet.catalan.xml
 share/dasher/alphabet.cherokee.xml
-share/dasher/alphabet.chinese.xml
-share/dasher/alphabet.chineseRuby.xml
 share/dasher/alphabet.corsican.xml
 share/dasher/alphabet.croatian.xml
 share/dasher/alphabet.czech.xml
@@ -91,6 +91,7 @@
 share/dasher/alphabet.hiragana2.xml
 share/dasher/alphabet.hungarian.xml
 share/dasher/alphabet.ipa.xml
+share/dasher/alphabet.iso8859.xml
 share/dasher/alphabet.italian.xml
 share/dasher/alphabet.japanese.canna.xml
 share/dasher/alphabet.kazakh.xml
@@ -117,7 +118,6 @@
 share/dasher/alphabet.pashto.xml
 share/dasher/alphabet.perl.xml
 share/dasher/alphabet.persian.xml
-share/dasher/alphabet.pinyin.xml
 share/dasher/alphabet.pinyin2.xml
 share/dasher/alphabet.polish.xml
 share/dasher/alphabet.portuguese.xml
@@ -128,6 +128,9 @@
 share/dasher/alphabet.serbian.xml
 share/dasher/alphabet.somali.xml
 share/dasher/alphabet.spanish.xml
+share/dasher/alphabet.spyNew.xml
+share/dasher/alphabet.spyTones2New.xml
+share/dasher/alphabet.spyTonesNew.xml
 share/dasher/alphabet.swahili.xml
 share/dasher/alphabet.swedish.xml
 share/dasher/alphabet.thaana.xml
@@ -149,27 +152,39 @@
 share/dasher/colour.vowels.xml
 share/dasher/colour.vowels2.xml
 share/dasher/colour.xml
-share/dasher/controllabels.dtd
-share/dasher/controllabels.xml
-share/dasher/dasher.compose.glade
-share/dasher/dasher.direct.glade
-share/dasher/dasher.fullscreen.glade
-share/dasher/dasher.gameWIP.glade
-share/dasher/dasher.preferences.glade
-share/dasher/dasher.traditional.glade
-share/dasher/dashermaemo.glade
-share/dasher/dashermaemo.preferences.glade
-share/dasher/dashermaemofullscreen.glade
+share/dasher/control.411.xml
+share/dasher/control.all.txt.xml
+share/dasher/control.all.xml
+share/dasher/control.dtd
+share/dasher/control.edit.txt.xml
+share/dasher/control.edit.xml
+share/dasher/control.prepared_speech.txt.xml
+share/dasher/control.prepared_speech.xml
+share/dasher/control.speak.txt.xml
+share/dasher/control.speak.xml
+share/dasher/control.xml
+share/dasher/dasher.preferences.ui
+share/dasher/dasher.traditional.ui
+share/dasher/dashermaemo.preferences.ui
+share/dasher/dashermaemo.ui
+share/dasher/dashermaemofullscreen.ui
+share/dasher/settings.direct.xml
+share/dasher/settings.dtd
+share/dasher/settings.edit.xml
+share/dasher/settings.prepared_speech.xml
+share/dasher/settings.speak.xml
 share/dasher/training_albanian_SQ.txt
-share/dasher/training_basque_EU.txt
+share/dasher/training_basque_ES.txt
 share/dasher/training_bengali_BD.txt
-share/dasher/training_bengali_bn.txt
 share/dasher/training_canna_JP.txt
+share/dasher/training_czechC_CS.txt
 share/dasher/training_czech_CS.txt
 share/dasher/training_danish_DK.txt
 share/dasher/training_dutch_NL.txt
+share/dasher/training_englishLC_GB.txt
 share/dasher/training_english_GB.txt
 share/dasher/training_finnish_FI.txt
+share/dasher/training_frenchC_FR.txt
 share/dasher/training_french_FR.txt
 share/dasher/training_german_DE.txt
 share/dasher/training_greek_GR.txt
@@ -177,183 +192,27 @@
 share/dasher/training_hiragana60_JP.txt
 share/dasher/training_hiragana83_JP.txt
 share/dasher/training_hungarian_HU.txt
+share/dasher/training_italianC_IT.txt
 share/dasher/training_italian_IT.txt
 share/dasher/training_mongolian_MN.txt
 share/dasher/training_persian_IR.txt
 share/dasher/training_polish_PL.txt
+share/dasher/training_portugueseC_BR.txt
 share/dasher/training_portuguese_BR.txt
 share/dasher/training_russian_RU.txt
+share/dasher/training_spanishC_ES.txt
 share/dasher/training_spanish_ES.txt
+share/dasher/training_spyNew.txt
 share/dasher/training_swahili_KE.txt
 share/dasher/training_swedish_SE.txt
 share/dasher/training_turkish_TR.txt
 share/dasher/training_welsh_GB.txt
-share/gconf/schemas/dasher.schemas
-${PLIST.gnome}share/gnome/help/dasher/C/dasher.xml
-${PLIST.gnome}share/gnome/help/dasher/C/figures/a-z.gif
-${PLIST.gnome}share/gnome/help/dasher/C/figures/aa-az.gif
-${PLIST.gnome}share/gnome/help/dasher/C/figures/ala-alz.gif
-${PLIST.gnome}share/gnome/help/dasher/C/figures/exampleHad2.png
-${PLIST.gnome}share/gnome/help/dasher/C/figures/exampleHad2a.png
-${PLIST.gnome}share/gnome/help/dasher/C/figures/exampleHad3a.png
-${PLIST.gnome}share/gnome/help/dasher/C/figures/exampleHad4.png
-${PLIST.gnome}share/gnome/help/dasher/C/figures/figure2.png
-${PLIST.gnome}share/gnome/help/dasher/C/figures/main.png
-${PLIST.gnome}share/gnome/help/dasher/C/figures/object.gif
-${PLIST.gnome}share/gnome/help/dasher/C/figures/prefs1.png
-${PLIST.gnome}share/gnome/help/dasher/C/figures/prefs2.png
-${PLIST.gnome}share/gnome/help/dasher/C/figures/prefs3.png
-${PLIST.gnome}share/gnome/help/dasher/C/figures/prefs4.png
-${PLIST.gnome}share/gnome/help/dasher/C/figures/prefs5.png
-${PLIST.gnome}share/gnome/help/dasher/de/dasher.xml
-${PLIST.gnome}share/gnome/help/dasher/de/figures/a-z.gif
-${PLIST.gnome}share/gnome/help/dasher/de/figures/aa-az.gif
-${PLIST.gnome}share/gnome/help/dasher/de/figures/ala-alz.gif
-${PLIST.gnome}share/gnome/help/dasher/de/figures/exampleHad2.png
-${PLIST.gnome}share/gnome/help/dasher/de/figures/exampleHad2a.png
-${PLIST.gnome}share/gnome/help/dasher/de/figures/exampleHad3a.png
-${PLIST.gnome}share/gnome/help/dasher/de/figures/exampleHad4.png
-${PLIST.gnome}share/gnome/help/dasher/de/figures/figure2.png
-${PLIST.gnome}share/gnome/help/dasher/de/figures/main.png
-${PLIST.gnome}share/gnome/help/dasher/de/figures/object.gif
-${PLIST.gnome}share/gnome/help/dasher/de/figures/prefs1.png
-${PLIST.gnome}share/gnome/help/dasher/de/figures/prefs2.png
-${PLIST.gnome}share/gnome/help/dasher/de/figures/prefs3.png
-${PLIST.gnome}share/gnome/help/dasher/de/figures/prefs4.png
-${PLIST.gnome}share/gnome/help/dasher/de/figures/prefs5.png
-${PLIST.gnome}share/gnome/help/dasher/el/dasher.xml
-${PLIST.gnome}share/gnome/help/dasher/el/figures/a-z.gif
-${PLIST.gnome}share/gnome/help/dasher/el/figures/aa-az.gif
-${PLIST.gnome}share/gnome/help/dasher/el/figures/ala-alz.gif
-${PLIST.gnome}share/gnome/help/dasher/el/figures/exampleHad2.png
-${PLIST.gnome}share/gnome/help/dasher/el/figures/exampleHad2a.png
-${PLIST.gnome}share/gnome/help/dasher/el/figures/exampleHad3a.png
-${PLIST.gnome}share/gnome/help/dasher/el/figures/exampleHad4.png
-${PLIST.gnome}share/gnome/help/dasher/el/figures/figure2.png
-${PLIST.gnome}share/gnome/help/dasher/el/figures/main.png
-${PLIST.gnome}share/gnome/help/dasher/el/figures/object.gif
-${PLIST.gnome}share/gnome/help/dasher/el/figures/prefs1.png
-${PLIST.gnome}share/gnome/help/dasher/el/figures/prefs2.png
-${PLIST.gnome}share/gnome/help/dasher/el/figures/prefs3.png
-${PLIST.gnome}share/gnome/help/dasher/el/figures/prefs4.png
-${PLIST.gnome}share/gnome/help/dasher/el/figures/prefs5.png
-${PLIST.gnome}share/gnome/help/dasher/en_GB/dasher.xml
-${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/a-z.gif
-${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/aa-az.gif
-${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/ala-alz.gif
-${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/exampleHad2.png
-${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/exampleHad2a.png
-${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/exampleHad3a.png
-${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/exampleHad4.png
-${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/figure2.png
-${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/main.png
-${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/object.gif
-${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/prefs1.png
-${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/prefs2.png
-${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/prefs3.png
-${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/prefs4.png
-${PLIST.gnome}share/gnome/help/dasher/en_GB/figures/prefs5.png
-${PLIST.gnome}share/gnome/help/dasher/es/dasher.xml
-${PLIST.gnome}share/gnome/help/dasher/es/figures/a-z.gif
-${PLIST.gnome}share/gnome/help/dasher/es/figures/aa-az.gif
-${PLIST.gnome}share/gnome/help/dasher/es/figures/ala-alz.gif
-${PLIST.gnome}share/gnome/help/dasher/es/figures/exampleHad2.png
-${PLIST.gnome}share/gnome/help/dasher/es/figures/exampleHad2a.png
-${PLIST.gnome}share/gnome/help/dasher/es/figures/exampleHad3a.png
-${PLIST.gnome}share/gnome/help/dasher/es/figures/exampleHad4.png
-${PLIST.gnome}share/gnome/help/dasher/es/figures/figure2.png
-${PLIST.gnome}share/gnome/help/dasher/es/figures/main.png
-${PLIST.gnome}share/gnome/help/dasher/es/figures/object.gif
-${PLIST.gnome}share/gnome/help/dasher/es/figures/prefs1.png
-${PLIST.gnome}share/gnome/help/dasher/es/figures/prefs2.png
-${PLIST.gnome}share/gnome/help/dasher/es/figures/prefs3.png
-${PLIST.gnome}share/gnome/help/dasher/es/figures/prefs4.png
-${PLIST.gnome}share/gnome/help/dasher/es/figures/prefs5.png
-${PLIST.gnome}share/gnome/help/dasher/eu/dasher.xml
-${PLIST.gnome}share/gnome/help/dasher/eu/figures/a-z.gif
-${PLIST.gnome}share/gnome/help/dasher/eu/figures/aa-az.gif
-${PLIST.gnome}share/gnome/help/dasher/eu/figures/ala-alz.gif
-${PLIST.gnome}share/gnome/help/dasher/eu/figures/exampleHad2.png
-${PLIST.gnome}share/gnome/help/dasher/eu/figures/exampleHad2a.png
-${PLIST.gnome}share/gnome/help/dasher/eu/figures/exampleHad3a.png
-${PLIST.gnome}share/gnome/help/dasher/eu/figures/exampleHad4.png
-${PLIST.gnome}share/gnome/help/dasher/eu/figures/figure2.png
-${PLIST.gnome}share/gnome/help/dasher/eu/figures/main.png
-${PLIST.gnome}share/gnome/help/dasher/eu/figures/object.gif
-${PLIST.gnome}share/gnome/help/dasher/eu/figures/prefs1.png
-${PLIST.gnome}share/gnome/help/dasher/eu/figures/prefs2.png
-${PLIST.gnome}share/gnome/help/dasher/eu/figures/prefs3.png
-${PLIST.gnome}share/gnome/help/dasher/eu/figures/prefs4.png
-${PLIST.gnome}share/gnome/help/dasher/eu/figures/prefs5.png
-${PLIST.gnome}share/gnome/help/dasher/fr/dasher.xml
-${PLIST.gnome}share/gnome/help/dasher/fr/figures/a-z.gif
-${PLIST.gnome}share/gnome/help/dasher/fr/figures/aa-az.gif
-${PLIST.gnome}share/gnome/help/dasher/fr/figures/ala-alz.gif
-${PLIST.gnome}share/gnome/help/dasher/fr/figures/exampleHad2.png
-${PLIST.gnome}share/gnome/help/dasher/fr/figures/exampleHad2a.png
-${PLIST.gnome}share/gnome/help/dasher/fr/figures/exampleHad3a.png
-${PLIST.gnome}share/gnome/help/dasher/fr/figures/exampleHad4.png
-${PLIST.gnome}share/gnome/help/dasher/fr/figures/figure2.png
-${PLIST.gnome}share/gnome/help/dasher/fr/figures/main.png
-${PLIST.gnome}share/gnome/help/dasher/fr/figures/object.gif
-${PLIST.gnome}share/gnome/help/dasher/fr/figures/prefs1.png
-${PLIST.gnome}share/gnome/help/dasher/fr/figures/prefs2.png