Update gedit to 3.36.2

python based plugins need libpeas' py-gobject dep to be reinstated

Many changes including:
* Fix compilation on macOS.
* GSettings schema: enable more features by default (auto-indent,
  display-line-numbers, highlight-current-line and bracket-matching) and set
  default style scheme to 'tango'.
* Bump gedit API version to 3.36.
* New dependency: Tepl, which itself depends on Amtk and uchardet.
- Fix segfault in open document selector (Sebastien)
- Fix several crash bugs (Andrea)
- Switch to meson (Martin)
- Drop autotools support (Jeremy)
- Allow closing tabs with middle-click (Corey)
- Migrate to gettext and stop using intltool (Martin)
- Switch from gtksourceview3 to gtksourceview4 (Christian)
- Port GeditFileChooserDialogGtk to GtkFileChooserNative

6 files changed, 136 insertions, 340 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 29844d45785..5083dbb6ce2 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.152 2020/06/02 08:23:43 adam Exp $
+# $NetBSD: Makefile,v 1.153 2020/07/31 11:05:49 prlw1 Exp $
 
-DISTNAME=	gedit-3.22.1
-PKGREVISION=	13
+DISTNAME=	gedit-3.36.2
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gedit/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
@@ -13,40 +12,40 @@ LICENSE=	gnu-gpl-v2
 
 PREV_PKGPATH=	editors/gedit3
 
-USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
-GNU_CONFIGURE=		yes
+USE_TOOLS+=			gmake gettext msgfmt perl pkg-config
+_TOOLS_USE_PKGSRC.msgfmt=	yes
 
-PKGCONFIG_OVERRIDE+=		data/gedit.pc.in
-PY_PATCHPLIST=			yes
 PYTHON_VERSIONS_INCOMPATIBLE=	27
+PY_PATCHPLIST=			yes
 REPLACE_PYTHON+=		plugins/externaltools/data/send-to-fpaste.tool.in
+REPLACE_PYTHON+=		build-aux/meson/post_install.py
 
-CONFIGURE_ARGS+=	--disable-updater
-CONFIGURE_ARGS+=	--disable-deprecations
-CONFIGURE_ARGS+=	--disable-maintainer-mode
-
-.include "options.mk"
+MESON_ARGS+=	-Dvapi=false
+MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/gedit
 
 DEPENDS+=	adwaita-icon-theme-[0-9]*:../../graphics/adwaita-icon-theme
 DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 BUILD_DEPENDS+=	itstool-[0-9]*:../../textproc/itstool
 
+pre-configure:
+	${FIND} ${WRKSRC}/help -type f -exec ${CHMOD} 644 {} \;
+
+
 .include "../../devel/gobject-introspection/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libpeas+=	libpeas>=1.14.1
 .include "../../devel/libpeas/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.44.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.52
 .include "../../devel/glib2/schemas.mk"
-.include "../../devel/py-gobject3-common/buildlink3.mk"
+.include "../../devel/meson/build.mk"
+.include "../../editors/tepl4/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.21.3
+.include "../../textproc/gspell/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.22
 .include "../../x11/gtk3/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtksourceview3+=	gtksourceview3>=3.21.2
-.include "../../x11/gtksourceview3/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtksourceview4+=	gtksourceview4>=4.0.2
+.include "../../x11/gtksourceview4/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 
diff --git a/editors/gedit/PLIST b/editors/gedit/PLIST
index 1a29984feed..e6713bee431 100644
--- a/editors/gedit/PLIST
+++ b/editors/gedit/PLIST
@@ -1,151 +1,79 @@
-@comment $NetBSD: PLIST,v 1.45 2019/10/25 13:58:42 kamil Exp $
+@comment $NetBSD: PLIST,v 1.46 2020/07/31 11:05:49 prlw1 Exp $
 bin/gedit
-bin/gnome-text-editor
-include/gedit-3.14/gedit/gedit-app-activatable.h
-include/gedit-3.14/gedit/gedit-app.h
-include/gedit-3.14/gedit/gedit-commands.h
-include/gedit-3.14/gedit/gedit-debug.h
-include/gedit-3.14/gedit/gedit-document.h
-include/gedit-3.14/gedit/gedit-encodings-combo-box.h
-include/gedit-3.14/gedit/gedit-menu-extension.h
-include/gedit-3.14/gedit/gedit-message-bus.h
-include/gedit-3.14/gedit/gedit-message.h
-include/gedit-3.14/gedit/gedit-progress-info-bar.h
-include/gedit-3.14/gedit/gedit-statusbar.h
-include/gedit-3.14/gedit/gedit-tab.h
-include/gedit-3.14/gedit/gedit-utils.h
-include/gedit-3.14/gedit/gedit-view-activatable.h
-include/gedit-3.14/gedit/gedit-view.h
-include/gedit-3.14/gedit/gedit-window-activatable.h
-include/gedit-3.14/gedit/gedit-window.h
+include/gedit-3.36/gedit/gedit-app-activatable.h
+include/gedit-3.36/gedit/gedit-app.h
+include/gedit-3.36/gedit/gedit-commands.h
+include/gedit-3.36/gedit/gedit-debug.h
+include/gedit-3.36/gedit/gedit-document.h
+include/gedit-3.36/gedit/gedit-encodings-combo-box.h
+include/gedit-3.36/gedit/gedit-menu-extension.h
+include/gedit-3.36/gedit/gedit-message-bus.h
+include/gedit-3.36/gedit/gedit-message.h
+include/gedit-3.36/gedit/gedit-progress-info-bar.h
+include/gedit-3.36/gedit/gedit-statusbar.h
+include/gedit-3.36/gedit/gedit-tab.h
+include/gedit-3.36/gedit/gedit-utils.h
+include/gedit-3.36/gedit/gedit-view-activatable.h
+include/gedit-3.36/gedit/gedit-view.h
+include/gedit-3.36/gedit/gedit-window-activatable.h
+include/gedit-3.36/gedit/gedit-window.h
 lib/gedit/girepository-1.0/Gedit-3.0.typelib
-lib/gedit/libgedit.la
 lib/gedit/plugins/docinfo.plugin
 lib/gedit/plugins/externaltools.plugin
 lib/gedit/plugins/externaltools/__init__.py
-lib/gedit/plugins/externaltools/__init__.pyc
-lib/gedit/plugins/externaltools/__init__.pyo
 lib/gedit/plugins/externaltools/appactivatable.py
-lib/gedit/plugins/externaltools/appactivatable.pyc
-lib/gedit/plugins/externaltools/appactivatable.pyo
 lib/gedit/plugins/externaltools/capture.py
-lib/gedit/plugins/externaltools/capture.pyc
-lib/gedit/plugins/externaltools/capture.pyo
 lib/gedit/plugins/externaltools/filelookup.py
-lib/gedit/plugins/externaltools/filelookup.pyc
-lib/gedit/plugins/externaltools/filelookup.pyo
 lib/gedit/plugins/externaltools/functions.py
-lib/gedit/plugins/externaltools/functions.pyc
-lib/gedit/plugins/externaltools/functions.pyo
 lib/gedit/plugins/externaltools/library.py
-lib/gedit/plugins/externaltools/library.pyc
-lib/gedit/plugins/externaltools/library.pyo
 lib/gedit/plugins/externaltools/linkparsing.py
-lib/gedit/plugins/externaltools/linkparsing.pyc
-lib/gedit/plugins/externaltools/linkparsing.pyo
 lib/gedit/plugins/externaltools/manager.py
-lib/gedit/plugins/externaltools/manager.pyc
-lib/gedit/plugins/externaltools/manager.pyo
 lib/gedit/plugins/externaltools/outputpanel.py
-lib/gedit/plugins/externaltools/outputpanel.pyc
-lib/gedit/plugins/externaltools/outputpanel.pyo
 lib/gedit/plugins/externaltools/windowactivatable.py
-lib/gedit/plugins/externaltools/windowactivatable.pyc
-lib/gedit/plugins/externaltools/windowactivatable.pyo
 lib/gedit/plugins/filebrowser.plugin
-lib/gedit/plugins/libdocinfo.la
-lib/gedit/plugins/libfilebrowser.la
-lib/gedit/plugins/libmodelines.la
-lib/gedit/plugins/libsort.la
-${PLIST.enchant}lib/gedit/plugins/libspell.la
-lib/gedit/plugins/libtime.la
+lib/gedit/plugins/libdocinfo.so
+lib/gedit/plugins/libfilebrowser.so
+lib/gedit/plugins/libmodelines.so
+lib/gedit/plugins/libquickhighlight.so
+lib/gedit/plugins/libsort.so
+lib/gedit/plugins/libspell.so
+lib/gedit/plugins/libtime.so
 lib/gedit/plugins/modelines.plugin
 lib/gedit/plugins/pythonconsole.plugin
 lib/gedit/plugins/pythonconsole/__init__.py
-lib/gedit/plugins/pythonconsole/__init__.pyc
-lib/gedit/plugins/pythonconsole/__init__.pyo
 lib/gedit/plugins/pythonconsole/config.py
-lib/gedit/plugins/pythonconsole/config.pyc
-lib/gedit/plugins/pythonconsole/config.pyo
 lib/gedit/plugins/pythonconsole/console.py
-lib/gedit/plugins/pythonconsole/console.pyc
-lib/gedit/plugins/pythonconsole/console.pyo
+lib/gedit/plugins/quickhighlight.plugin
 lib/gedit/plugins/quickopen.plugin
 lib/gedit/plugins/quickopen/__init__.py
-lib/gedit/plugins/quickopen/__init__.pyc
-lib/gedit/plugins/quickopen/__init__.pyo
 lib/gedit/plugins/quickopen/popup.py
-lib/gedit/plugins/quickopen/popup.pyc
-lib/gedit/plugins/quickopen/popup.pyo
 lib/gedit/plugins/quickopen/virtualdirs.py
-lib/gedit/plugins/quickopen/virtualdirs.pyc
-lib/gedit/plugins/quickopen/virtualdirs.pyo
 lib/gedit/plugins/snippets.plugin
 lib/gedit/plugins/snippets/__init__.py
-lib/gedit/plugins/snippets/__init__.pyc
-lib/gedit/plugins/snippets/__init__.pyo
 lib/gedit/plugins/snippets/appactivatable.py
-lib/gedit/plugins/snippets/appactivatable.pyc
-lib/gedit/plugins/snippets/appactivatable.pyo
 lib/gedit/plugins/snippets/completion.py
-lib/gedit/plugins/snippets/completion.pyc
-lib/gedit/plugins/snippets/completion.pyo
 lib/gedit/plugins/snippets/document.py
-lib/gedit/plugins/snippets/document.pyc
-lib/gedit/plugins/snippets/document.pyo
 lib/gedit/plugins/snippets/exporter.py
-lib/gedit/plugins/snippets/exporter.pyc
-lib/gedit/plugins/snippets/exporter.pyo
 lib/gedit/plugins/snippets/helper.py
-lib/gedit/plugins/snippets/helper.pyc
-lib/gedit/plugins/snippets/helper.pyo
 lib/gedit/plugins/snippets/importer.py
-lib/gedit/plugins/snippets/importer.pyc
-lib/gedit/plugins/snippets/importer.pyo
 lib/gedit/plugins/snippets/languagemanager.py
-lib/gedit/plugins/snippets/languagemanager.pyc
-lib/gedit/plugins/snippets/languagemanager.pyo
 lib/gedit/plugins/snippets/library.py
-lib/gedit/plugins/snippets/library.pyc
-lib/gedit/plugins/snippets/library.pyo
 lib/gedit/plugins/snippets/manager.py
-lib/gedit/plugins/snippets/manager.pyc
-lib/gedit/plugins/snippets/manager.pyo
 lib/gedit/plugins/snippets/parser.py
-lib/gedit/plugins/snippets/parser.pyc
-lib/gedit/plugins/snippets/parser.pyo
 lib/gedit/plugins/snippets/placeholder.py
-lib/gedit/plugins/snippets/placeholder.pyc
-lib/gedit/plugins/snippets/placeholder.pyo
 lib/gedit/plugins/snippets/shareddata.py
-lib/gedit/plugins/snippets/shareddata.pyc
-lib/gedit/plugins/snippets/shareddata.pyo
 lib/gedit/plugins/snippets/signals.py
-lib/gedit/plugins/snippets/signals.pyc
-lib/gedit/plugins/snippets/signals.pyo
 lib/gedit/plugins/snippets/singleton.py
-lib/gedit/plugins/snippets/singleton.pyc
-lib/gedit/plugins/snippets/singleton.pyo
 lib/gedit/plugins/snippets/snippet.py
-lib/gedit/plugins/snippets/snippet.pyc
-lib/gedit/plugins/snippets/snippet.pyo
 lib/gedit/plugins/snippets/substitutionparser.py
-lib/gedit/plugins/snippets/substitutionparser.pyc
-lib/gedit/plugins/snippets/substitutionparser.pyo
 lib/gedit/plugins/snippets/windowactivatable.py
-lib/gedit/plugins/snippets/windowactivatable.pyc
-lib/gedit/plugins/snippets/windowactivatable.pyo
 lib/gedit/plugins/sort.plugin
-${PLIST.enchant}lib/gedit/plugins/spell.plugin
+lib/gedit/plugins/spell.plugin
 lib/gedit/plugins/time.plugin
+lib/libgedit-3.36.so
 lib/pkgconfig/gedit.pc
 ${PYSITELIB}/gi/overrides/Gedit.py
-${PYSITELIB}/gi/overrides/Gedit.pyc
-${PYSITELIB}/gi/overrides/Gedit.pyo
-libexec/gedit/gedit-bugreport.sh
 man/man1/gedit.1
-share/GConf/gsettings/gedit.convert
-share/appdata/org.gnome.gedit.appdata.xml
 share/applications/org.gnome.gedit.desktop
 share/dbus-1/services/org.gnome.gedit.service
 share/gedit/gir-1.0/Gedit-3.0.gir
@@ -191,47 +119,11 @@ share/glib-2.0/schemas/org.gnome.gedit.plugins.externaltools.gschema.xml
 share/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.enums.xml
 share/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.gschema.xml
 share/glib-2.0/schemas/org.gnome.gedit.plugins.pythonconsole.gschema.xml
+share/glib-2.0/schemas/org.gnome.gedit.plugins.spell.gschema.xml
 share/glib-2.0/schemas/org.gnome.gedit.plugins.time.enums.xml
 share/glib-2.0/schemas/org.gnome.gedit.plugins.time.gschema.xml
-share/gtk-doc/html/gedit/gedit-GeditApp.html
-share/gtk-doc/html/gedit/gedit-GeditAppActivatable.html
-share/gtk-doc/html/gedit/gedit-GeditDocument.html
-share/gtk-doc/html/gedit/gedit-GeditEncodingsComboBox.html
-share/gtk-doc/html/gedit/gedit-GeditMessage.html
-share/gtk-doc/html/gedit/gedit-GeditMessageBus.html
-share/gtk-doc/html/gedit/gedit-GeditProgressInfoBar.html
-share/gtk-doc/html/gedit/gedit-GeditStatusbar.html
-share/gtk-doc/html/gedit/gedit-GeditViewActivatable.html
-share/gtk-doc/html/gedit/gedit-GeditWindowActivatable.html
-share/gtk-doc/html/gedit/api-index-3-14.html
-share/gtk-doc/html/gedit/api-index-deprecated.html
-share/gtk-doc/html/gedit/api-index-full.html
-share/gtk-doc/html/gedit/ch01.html
-share/gtk-doc/html/gedit/gedit-GeditCommands.html
-share/gtk-doc/html/gedit/gedit-gedit-debug.html
-share/gtk-doc/html/gedit/gedit-gedit-menu-extension.html
-share/gtk-doc/html/gedit/gedit-gedit-tab.html
-share/gtk-doc/html/gedit/gedit-gedit-utils.html
-share/gtk-doc/html/gedit/gedit-gedit-view.html
-share/gtk-doc/html/gedit/gedit-gedit-window.html
-share/gtk-doc/html/gedit/gedit.devhelp2
-share/gtk-doc/html/gedit/home.png
-share/gtk-doc/html/gedit/index.html
-share/gtk-doc/html/gedit/left-insensitive.png
-share/gtk-doc/html/gedit/left.png
-share/gtk-doc/html/gedit/object-tree.html
-share/gtk-doc/html/gedit/right-insensitive.png
-share/gtk-doc/html/gedit/right.png
-share/gtk-doc/html/gedit/style.css
-share/gtk-doc/html/gedit/up-insensitive.png
-share/gtk-doc/html/gedit/up.png
 share/help/C/gedit/figures/gedit-html-snippet.png
 share/help/C/gedit/figures/gedit-icon.png
-share/help/C/gedit/figures/gedit-new-external-tool.png
-share/help/C/gedit/figures/gedit-open-location.png
-share/help/C/gedit/figures/gedit-side-pane1.png
-share/help/C/gedit/figures/gedit-side-pane2.png
-share/help/C/gedit/figures/gedit-side-pane3.png
 share/help/C/gedit/figures/gedit3-screenshot.png
 share/help/C/gedit/gedit-change-color-scheme.page
 share/help/C/gedit/gedit-change-default-font.page
@@ -274,11 +166,6 @@ share/help/C/gedit/index.page
 share/help/C/gedit/legal.xml
 share/help/ar/gedit/figures/gedit-html-snippet.png
 share/help/ar/gedit/figures/gedit-icon.png
-share/help/ar/gedit/figures/gedit-new-external-tool.png
-share/help/ar/gedit/figures/gedit-open-location.png
-share/help/ar/gedit/figures/gedit-side-pane1.png
-share/help/ar/gedit/figures/gedit-side-pane2.png
-share/help/ar/gedit/figures/gedit-side-pane3.png
 share/help/ar/gedit/figures/gedit3-screenshot.png
 share/help/ar/gedit/gedit-change-color-scheme.page
 share/help/ar/gedit/gedit-change-default-font.page
@@ -321,11 +208,6 @@ share/help/ar/gedit/index.page
 share/help/ar/gedit/legal.xml
 share/help/bg/gedit/figures/gedit-html-snippet.png
 share/help/bg/gedit/figures/gedit-icon.png
-share/help/bg/gedit/figures/gedit-new-external-tool.png
-share/help/bg/gedit/figures/gedit-open-location.png
-share/help/bg/gedit/figures/gedit-side-pane1.png
-share/help/bg/gedit/figures/gedit-side-pane2.png
-share/help/bg/gedit/figures/gedit-side-pane3.png
 share/help/bg/gedit/figures/gedit3-screenshot.png
 share/help/bg/gedit/gedit-change-color-scheme.page
 share/help/bg/gedit/gedit-change-default-font.page
@@ -368,11 +250,6 @@ share/help/bg/gedit/index.page
 share/help/bg/gedit/legal.xml
 share/help/ca/gedit/figures/gedit-html-snippet.png
 share/help/ca/gedit/figures/gedit-icon.png
-share/help/ca/gedit/figures/gedit-new-external-tool.png
-share/help/ca/gedit/figures/gedit-open-location.png
-share/help/ca/gedit/figures/gedit-side-pane1.png
-share/help/ca/gedit/figures/gedit-side-pane2.png
-share/help/ca/gedit/figures/gedit-side-pane3.png
 share/help/ca/gedit/figures/gedit3-screenshot.png
 share/help/ca/gedit/gedit-change-color-scheme.page
 share/help/ca/gedit/gedit-change-default-font.page
@@ -415,11 +292,6 @@ share/help/ca/gedit/index.page
 share/help/ca/gedit/legal.xml
 share/help/cs/gedit/figures/gedit-html-snippet.png
 share/help/cs/gedit/figures/gedit-icon.png
-share/help/cs/gedit/figures/gedit-new-external-tool.png
-share/help/cs/gedit/figures/gedit-open-location.png
-share/help/cs/gedit/figures/gedit-side-pane1.png
-share/help/cs/gedit/figures/gedit-side-pane2.png
-share/help/cs/gedit/figures/gedit-side-pane3.png
 share/help/cs/gedit/figures/gedit3-screenshot.png
 share/help/cs/gedit/gedit-change-color-scheme.page
 share/help/cs/gedit/gedit-change-default-font.page
@@ -462,11 +334,6 @@ share/help/cs/gedit/index.page
 share/help/cs/gedit/legal.xml
 share/help/da/gedit/figures/gedit-html-snippet.png
 share/help/da/gedit/figures/gedit-icon.png
-share/help/da/gedit/figures/gedit-new-external-tool.png
-share/help/da/gedit/figures/gedit-open-location.png
-share/help/da/gedit/figures/gedit-side-pane1.png
-share/help/da/gedit/figures/gedit-side-pane2.png
-share/help/da/gedit/figures/gedit-side-pane3.png
 share/help/da/gedit/figures/gedit3-screenshot.png
 share/help/da/gedit/gedit-change-color-scheme.page
 share/help/da/gedit/gedit-change-default-font.page
@@ -509,11 +376,6 @@ share/help/da/gedit/index.page
 share/help/da/gedit/legal.xml
 share/help/de/gedit/figures/gedit-html-snippet.png
 share/help/de/gedit/figures/gedit-icon.png
-share/help/de/gedit/figures/gedit-new-external-tool.png
-share/help/de/gedit/figures/gedit-open-location.png
-share/help/de/gedit/figures/gedit-side-pane1.png
-share/help/de/gedit/figures/gedit-side-pane2.png
-share/help/de/gedit/figures/gedit-side-pane3.png
 share/help/de/gedit/figures/gedit3-screenshot.png
 share/help/de/gedit/gedit-change-color-scheme.page
 share/help/de/gedit/gedit-change-default-font.page
@@ -556,11 +418,6 @@ share/help/de/gedit/index.page
 share/help/de/gedit/legal.xml
 share/help/el/gedit/figures/gedit-html-snippet.png
 share/help/el/gedit/figures/gedit-icon.png
-share/help/el/gedit/figures/gedit-new-external-tool.png
-share/help/el/gedit/figures/gedit-open-location.png
-share/help/el/gedit/figures/gedit-side-pane1.png
-share/help/el/gedit/figures/gedit-side-pane2.png
-share/help/el/gedit/figures/gedit-side-pane3.png
 share/help/el/gedit/figures/gedit3-screenshot.png
 share/help/el/gedit/gedit-change-color-scheme.page
 share/help/el/gedit/gedit-change-default-font.page
@@ -603,11 +460,6 @@ share/help/el/gedit/index.page
 share/help/el/gedit/legal.xml
 share/help/es/gedit/figures/gedit-html-snippet.png
 share/help/es/gedit/figures/gedit-icon.png
-share/help/es/gedit/figures/gedit-new-external-tool.png
-share/help/es/gedit/figures/gedit-open-location.png
-share/help/es/gedit/figures/gedit-side-pane1.png
-share/help/es/gedit/figures/gedit-side-pane2.png
-share/help/es/gedit/figures/gedit-side-pane3.png
 share/help/es/gedit/figures/gedit3-screenshot.png
 share/help/es/gedit/gedit-change-color-scheme.page
 share/help/es/gedit/gedit-change-default-font.page
@@ -650,11 +502,6 @@ share/help/es/gedit/index.page
 share/help/es/gedit/legal.xml
 share/help/eu/gedit/figures/gedit-html-snippet.png
 share/help/eu/gedit/figures/gedit-icon.png
-share/help/eu/gedit/figures/gedit-new-external-tool.png
-share/help/eu/gedit/figures/gedit-open-location.png
-share/help/eu/gedit/figures/gedit-side-pane1.png
-share/help/eu/gedit/figures/gedit-side-pane2.png
-share/help/eu/gedit/figures/gedit-side-pane3.png
 share/help/eu/gedit/figures/gedit3-screenshot.png
 share/help/eu/gedit/gedit-change-color-scheme.page
 share/help/eu/gedit/gedit-change-default-font.page
@@ -697,11 +544,6 @@ share/help/eu/gedit/index.page
 share/help/eu/gedit/legal.xml
 share/help/fi/gedit/figures/gedit-html-snippet.png
 share/help/fi/gedit/figures/gedit-icon.png
-share/help/fi/gedit/figures/gedit-new-external-tool.png
-share/help/fi/gedit/figures/gedit-open-location.png
-share/help/fi/gedit/figures/gedit-side-pane1.png
-share/help/fi/gedit/figures/gedit-side-pane2.png
-share/help/fi/gedit/figures/gedit-side-pane3.png
 share/help/fi/gedit/figures/gedit3-screenshot.png
 share/help/fi/gedit/gedit-change-color-scheme.page
 share/help/fi/gedit/gedit-change-default-font.page
@@ -744,11 +586,6 @@ share/help/fi/gedit/index.page
 share/help/fi/gedit/legal.xml
 share/help/fr/gedit/figures/gedit-html-snippet.png
 share/help/fr/gedit/figures/gedit-icon.png
-share/help/fr/gedit/figures/gedit-new-external-tool.png
-share/help/fr/gedit/figures/gedit-open-location.png
-share/help/fr/gedit/figures/gedit-side-pane1.png
-share/help/fr/gedit/figures/gedit-side-pane2.png
-share/help/fr/gedit/figures/gedit-side-pane3.png
 share/help/fr/gedit/figures/gedit3-screenshot.png
 share/help/fr/gedit/gedit-change-color-scheme.page
 share/help/fr/gedit/gedit-change-default-font.page
@@ -791,11 +628,6 @@ share/help/fr/gedit/index.page
 share/help/fr/gedit/legal.xml
 share/help/gl/gedit/figures/gedit-html-snippet.png
 share/help/gl/gedit/figures/gedit-icon.png
-share/help/gl/gedit/figures/gedit-new-external-tool.png
-share/help/gl/gedit/figures/gedit-open-location.png
-share/help/gl/gedit/figures/gedit-side-pane1.png
-share/help/gl/gedit/figures/gedit-side-pane2.png
-share/help/gl/gedit/figures/gedit-side-pane3.png
 share/help/gl/gedit/figures/gedit3-screenshot.png
 share/help/gl/gedit/gedit-change-color-scheme.page
 share/help/gl/gedit/gedit-change-default-font.page
@@ -838,11 +670,6 @@ share/help/gl/gedit/index.page
 share/help/gl/gedit/legal.xml
 share/help/hu/gedit/figures/gedit-html-snippet.png
 share/help/hu/gedit/figures/gedit-icon.png
-share/help/hu/gedit/figures/gedit-new-external-tool.png
-share/help/hu/gedit/figures/gedit-open-location.png
-share/help/hu/gedit/figures/gedit-side-pane1.png
-share/help/hu/gedit/figures/gedit-side-pane2.png
-share/help/hu/gedit/figures/gedit-side-pane3.png
 share/help/hu/gedit/figures/gedit3-screenshot.png
 share/help/hu/gedit/gedit-change-color-scheme.page
 share/help/hu/gedit/gedit-change-default-font.page
@@ -885,11 +712,6 @@ share/help/hu/gedit/index.page
 share/help/hu/gedit/legal.xml
 share/help/id/gedit/figures/gedit-html-snippet.png
 share/help/id/gedit/figures/gedit-icon.png
-share/help/id/gedit/figures/gedit-new-external-tool.png
-share/help/id/gedit/figures/gedit-open-location.png
-share/help/id/gedit/figures/gedit-side-pane1.png
-share/help/id/gedit/figures/gedit-side-pane2.png
-share/help/id/gedit/figures/gedit-side-pane3.png
 share/help/id/gedit/figures/gedit3-screenshot.png
 share/help/id/gedit/gedit-change-color-scheme.page
 share/help/id/gedit/gedit-change-default-font.page
@@ -932,11 +754,6 @@ share/help/id/gedit/index.page
 share/help/id/gedit/legal.xml
 share/help/it/gedit/figures/gedit-html-snippet.png
 share/help/it/gedit/figures/gedit-icon.png
-share/help/it/gedit/figures/gedit-new-external-tool.png
-share/help/it/gedit/figures/gedit-open-location.png
-share/help/it/gedit/figures/gedit-side-pane1.png
-share/help/it/gedit/figures/gedit-side-pane2.png
-share/help/it/gedit/figures/gedit-side-pane3.png
 share/help/it/gedit/figures/gedit3-screenshot.png
 share/help/it/gedit/gedit-change-color-scheme.page
 share/help/it/gedit/gedit-change-default-font.page
@@ -979,11 +796,6 @@ share/help/it/gedit/index.page
 share/help/it/gedit/legal.xml
 share/help/ja/gedit/figures/gedit-html-snippet.png
 share/help/ja/gedit/figures/gedit-icon.png
-share/help/ja/gedit/figures/gedit-new-external-tool.png
-share/help/ja/gedit/figures/gedit-open-location.png
-share/help/ja/gedit/figures/gedit-side-pane1.png
-share/help/ja/gedit/figures/gedit-side-pane2.png
-share/help/ja/gedit/figures/gedit-side-pane3.png
 share/help/ja/gedit/figures/gedit3-screenshot.png
 share/help/ja/gedit/gedit-change-color-scheme.page
 share/help/ja/gedit/gedit-change-default-font.page
@@ -1026,11 +838,6 @@ share/help/ja/gedit/index.page
 share/help/ja/gedit/legal.xml
 share/help/ko/gedit/figures/gedit-html-snippet.png
 share/help/ko/gedit/figures/gedit-icon.png
-share/help/ko/gedit/figures/gedit-new-external-tool.png
-share/help/ko/gedit/figures/gedit-open-location.png
-share/help/ko/gedit/figures/gedit-side-pane1.png
-share/help/ko/gedit/figures/gedit-side-pane2.png
-share/help/ko/gedit/figures/gedit-side-pane3.png
 share/help/ko/gedit/figures/gedit3-screenshot.png
 share/help/ko/gedit/gedit-change-color-scheme.page
 share/help/ko/gedit/gedit-change-default-font.page
@@ -1073,11 +880,6 @@ share/help/ko/gedit/index.page
 share/help/ko/gedit/legal.xml
 share/help/lv/gedit/figures/gedit-html-snippet.png
 share/help/lv/gedit/figures/gedit-icon.png
-share/help/lv/gedit/figures/gedit-new-external-tool.png
-share/help/lv/gedit/figures/gedit-open-location.png
-share/help/lv/gedit/figures/gedit-side-pane1.png
-share/help/lv/gedit/figures/gedit-side-pane2.png
-share/help/lv/gedit/figures/gedit-side-pane3.png
 share/help/lv/gedit/figures/gedit3-screenshot.png
 share/help/lv/gedit/gedit-change-color-scheme.page
 share/help/lv/gedit/gedit-change-default-font.page
@@ -1120,11 +922,6 @@ share/help/lv/gedit/index.page
 share/help/lv/gedit/legal.xml
 share/help/oc/gedit/figures/gedit-html-snippet.png
 share/help/oc/gedit/figures/gedit-icon.png
-share/help/oc/gedit/figures/gedit-new-external-tool.png
-share/help/oc/gedit/figures/gedit-open-location.png
-share/help/oc/gedit/figures/gedit-side-pane1.png
-share/help/oc/gedit/figures/gedit-side-pane2.png
-share/help/oc/gedit/figures/gedit-side-pane3.png
 share/help/oc/gedit/figures/gedit3-screenshot.png
 share/help/oc/gedit/gedit-change-color-scheme.page
 share/help/oc/gedit/gedit-change-default-font.page
@@ -1165,13 +962,50 @@ share/help/oc/gedit/gedit-tabs.page
 share/help/oc/gedit/gedit-undo-recent-action.page
 share/help/oc/gedit/index.page
 share/help/oc/gedit/legal.xml
+share/help/pl/gedit/figures/gedit-html-snippet.png
+share/help/pl/gedit/figures/gedit-icon.png
+share/help/pl/gedit/figures/gedit3-screenshot.png
+share/help/pl/gedit/gedit-change-color-scheme.page
+share/help/pl/gedit/gedit-change-default-font.page
+share/help/pl/gedit/gedit-close-file.page
+share/help/pl/gedit/gedit-create-new-file.page
+share/help/pl/gedit/gedit-edit-as-root.page
+share/help/pl/gedit/gedit-files-basic.page
+share/help/pl/gedit/gedit-full-screen.page
+share/help/pl/gedit/gedit-open-files-from-sidepane.page
+share/help/pl/gedit/gedit-open-files.page
+share/help/pl/gedit/gedit-open-on-server.page
+share/help/pl/gedit/gedit-open-recent.page
+share/help/pl/gedit/gedit-plugin-guide.page
+share/help/pl/gedit/gedit-plugins-change-case.page
+share/help/pl/gedit/gedit-plugins-doc-stats.page
+share/help/pl/gedit/gedit-plugins-external-tools.page
+share/help/pl/gedit/gedit-plugins-file-browser.page
+share/help/pl/gedit/gedit-plugins-insert-date-time.page
+share/help/pl/gedit/gedit-plugins-install.page
+share/help/pl/gedit/gedit-plugins-modelines.page
+share/help/pl/gedit/gedit-plugins-pyconsole.page
+share/help/pl/gedit/gedit-plugins-quick-open.page
+share/help/pl/gedit/gedit-plugins-snippets.page
+share/help/pl/gedit/gedit-plugins-sort.page
+share/help/pl/gedit/gedit-printing-order.page
+share/help/pl/gedit/gedit-printing-select.page
+share/help/pl/gedit/gedit-printing.page
+share/help/pl/gedit/gedit-quickstart.page
+share/help/pl/gedit/gedit-replace.page
+share/help/pl/gedit/gedit-save-file.page
+share/help/pl/gedit/gedit-search.page
+share/help/pl/gedit/gedit-shortcut-keys.page
+share/help/pl/gedit/gedit-spellcheck.page
+share/help/pl/gedit/gedit-syntax-highlighting.page
+share/help/pl/gedit/gedit-tab-groups.page
+share/help/pl/gedit/gedit-tabs-moving.page
+share/help/pl/gedit/gedit-tabs.page
+share/help/pl/gedit/gedit-undo-recent-action.page
+share/help/pl/gedit/index.page
+share/help/pl/gedit/legal.xml
 share/help/pt_BR/gedit/figures/gedit-html-snippet.png
 share/help/pt_BR/gedit/figures/gedit-icon.png
-share/help/pt_BR/gedit/figures/gedit-new-external-tool.png
-share/help/pt_BR/gedit/figures/gedit-open-location.png
-share/help/pt_BR/gedit/figures/gedit-side-pane1.png
-share/help/pt_BR/gedit/figures/gedit-side-pane2.png
-share/help/pt_BR/gedit/figures/gedit-side-pane3.png
 share/help/pt_BR/gedit/figures/gedit3-screenshot.png
 share/help/pt_BR/gedit/gedit-change-color-scheme.page
 share/help/pt_BR/gedit/gedit-change-default-font.page
@@ -1214,11 +1048,6 @@ share/help/pt_BR/gedit/index.page
 share/help/pt_BR/gedit/legal.xml
 share/help/ro/gedit/figures/gedit-html-snippet.png
 share/help/ro/gedit/figures/gedit-icon.png
-share/help/ro/gedit/figures/gedit-new-external-tool.png
-share/help/ro/gedit/figures/gedit-open-location.png
-share/help/ro/gedit/figures/gedit-side-pane1.png
-share/help/ro/gedit/figures/gedit-side-pane2.png
-share/help/ro/gedit/figures/gedit-side-pane3.png
 share/help/ro/gedit/figures/gedit3-screenshot.png
 share/help/ro/gedit/gedit-change-color-scheme.page
 share/help/ro/gedit/gedit-change-default-font.page
@@ -1261,11 +1090,6 @@ share/help/ro/gedit/index.page
 share/help/ro/gedit/legal.xml
 share/help/ru/gedit/figures/gedit-html-snippet.png
 share/help/ru/gedit/figures/gedit-icon.png
-share/help/ru/gedit/figures/gedit-new-external-tool.png
-share/help/ru/gedit/figures/gedit-open-location.png
-share/help/ru/gedit/figures/gedit-side-pane1.png
-share/help/ru/gedit/figures/gedit-side-pane2.png
-share/help/ru/gedit/figures/gedit-side-pane3.png
 share/help/ru/gedit/figures/gedit3-screenshot.png
 share/help/ru/gedit/gedit-change-color-scheme.page
 share/help/ru/gedit/gedit-change-default-font.page
@@ -1308,11 +1132,6 @@ share/help/ru/gedit/index.page
 share/help/ru/gedit/legal.xml
 share/help/sl/gedit/figures/gedit-html-snippet.png
 share/help/sl/gedit/figures/gedit-icon.png
-share/help/sl/gedit/figures/gedit-new-external-tool.png
-share/help/sl/gedit/figures/gedit-open-location.png
-share/help/sl/gedit/figures/gedit-side-pane1.png
-share/help/sl/gedit/figures/gedit-side-pane2.png
-share/help/sl/gedit/figures/gedit-side-pane3.png
 share/help/sl/gedit/figures/gedit3-screenshot.png
 share/help/sl/gedit/gedit-change-color-scheme.page
 share/help/sl/gedit/gedit-change-default-font.page
@@ -1355,11 +1174,6 @@ share/help/sl/gedit/index.page
 share/help/sl/gedit/legal.xml
 share/help/sv/gedit/figures/gedit-html-snippet.png
 share/help/sv/gedit/figures/gedit-icon.png
-share/help/sv/gedit/figures/gedit-new-external-tool.png
-share/help/sv/gedit/figures/gedit-open-location.png
-share/help/sv/gedit/figures/gedit-side-pane1.png
-share/help/sv/gedit/figures/gedit-side-pane2.png
-share/help/sv/gedit/figures/gedit-side-pane3.png
 share/help/sv/gedit/figures/gedit3-screenshot.png
 share/help/sv/gedit/gedit-change-color-scheme.page
 share/help/sv/gedit/gedit-change-default-font.page
@@ -1402,11 +1216,6 @@ share/help/sv/gedit/index.page
 share/help/sv/gedit/legal.xml
 share/help/te/gedit/figures/gedit-html-snippet.png
 share/help/te/gedit/figures/gedit-icon.png
-share/help/te/gedit/figures/gedit-new-external-tool.png
-share/help/te/gedit/figures/gedit-open-location.png
-share/help/te/gedit/figures/gedit-side-pane1.png
-share/help/te/gedit/figures/gedit-side-pane2.png
-share/help/te/gedit/figures/gedit-side-pane3.png
 share/help/te/gedit/figures/gedit3-screenshot.png
 share/help/te/gedit/gedit-change-color-scheme.page
 share/help/te/gedit/gedit-change-default-font.page
@@ -1449,11 +1258,6 @@ share/help/te/gedit/index.page
 share/help/te/gedit/legal.xml
 share/help/th/gedit/figures/gedit-html-snippet.png
 share/help/th/gedit/figures/gedit-icon.png
-share/help/th/gedit/figures/gedit-new-external-tool.png
-share/help/th/gedit/figures/gedit-open-location.png
-share/help/th/gedit/figures/gedit-side-pane1.png
-share/help/th/gedit/figures/gedit-side-pane2.png
-share/help/th/gedit/figures/gedit-side-pane3.png
 share/help/th/gedit/figures/gedit3-screenshot.png
 share/help/th/gedit/gedit-change-color-scheme.page
 share/help/th/gedit/gedit-change-default-font.page
@@ -1496,11 +1300,6 @@ share/help/th/gedit/index.page
 share/help/th/gedit/legal.xml
 share/help/uk/gedit/figures/gedit-html-snippet.png
 share/help/uk/gedit/figures/gedit-icon.png
-share/help/uk/gedit/figures/gedit-new-external-tool.png
-share/help/uk/gedit/figures/gedit-open-location.png
-share/help/uk/gedit/figures/gedit-side-pane1.png
-share/help/uk/gedit/figures/gedit-side-pane2.png
-share/help/uk/gedit/figures/gedit-side-pane3.png
 share/help/uk/gedit/figures/gedit3-screenshot.png
 share/help/uk/gedit/gedit-change-color-scheme.page
 share/help/uk/gedit/gedit-change-default-font.page
@@ -1543,11 +1342,6 @@ share/help/uk/gedit/index.page
 share/help/uk/gedit/legal.xml
 share/help/zh_CN/gedit/figures/gedit-html-snippet.png
 share/help/zh_CN/gedit/figures/gedit-icon.png
-share/help/zh_CN/gedit/figures/gedit-new-external-tool.png
-share/help/zh_CN/gedit/figures/gedit-open-location.png
-share/help/zh_CN/gedit/figures/gedit-side-pane1.png
-share/help/zh_CN/gedit/figures/gedit-side-pane2.png
-share/help/zh_CN/gedit/figures/gedit-side-pane3.png
 share/help/zh_CN/gedit/figures/gedit3-screenshot.png
 share/help/zh_CN/gedit/gedit-change-color-scheme.page
 share/help/zh_CN/gedit/gedit-change-default-font.page
@@ -1590,11 +1384,6 @@ share/help/zh_CN/gedit/index.page
 share/help/zh_CN/gedit/legal.xml
 share/help/zh_HK/gedit/figures/gedit-html-snippet.png
 share/help/zh_HK/gedit/figures/gedit-icon.png
-share/help/zh_HK/gedit/figures/gedit-new-external-tool.png
-share/help/zh_HK/gedit/figures/gedit-open-location.png
-share/help/zh_HK/gedit/figures/gedit-side-pane1.png
-share/help/zh_HK/gedit/figures/gedit-side-pane2.png
-share/help/zh_HK/gedit/figures/gedit-side-pane3.png
 share/help/zh_HK/gedit/figures/gedit3-screenshot.png
 share/help/zh_HK/gedit/gedit-change-color-scheme.page
 share/help/zh_HK/gedit/gedit-change-default-font.page
@@ -1637,11 +1426,6 @@ share/help/zh_HK/gedit/index.page
 share/help/zh_HK/gedit/legal.xml
 share/help/zh_TW/gedit/figures/gedit-html-snippet.png
 share/help/zh_TW/gedit/figures/gedit-icon.png
-share/help/zh_TW/gedit/figures/gedit-new-external-tool.png
-share/help/zh_TW/gedit/figures/gedit-open-location.png
-share/help/zh_TW/gedit/figures/gedit-side-pane1.png
-share/help/zh_TW/gedit/figures/gedit-side-pane2.png
-share/help/zh_TW/gedit/figures/gedit-side-pane3.png
 share/help/zh_TW/gedit/figures/gedit3-screenshot.png
 share/help/zh_TW/gedit/gedit-change-color-scheme.page
 share/help/zh_TW/gedit/gedit-change-default-font.page
@@ -1682,13 +1466,8 @@ share/help/zh_TW/gedit/gedit-tabs.page
 share/help/zh_TW/gedit/gedit-undo-recent-action.page
 share/help/zh_TW/gedit/index.page
 share/help/zh_TW/gedit/legal.xml
-share/icons/hicolor/16x16/apps/gedit.png
-share/icons/hicolor/22x22/apps/gedit.png
-share/icons/hicolor/24x24/apps/gedit.png
-share/icons/hicolor/256x256/apps/gedit.png
-share/icons/hicolor/32x32/apps/gedit.png
-share/icons/hicolor/48x48/apps/gedit.png
-share/icons/hicolor/symbolic/apps/gedit-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.gedit.svg
+share/icons/hicolor/symbolic/apps/org.gnome.gedit-symbolic.svg
 share/locale/af/LC_MESSAGES/gedit.mo
 share/locale/am/LC_MESSAGES/gedit.mo
 share/locale/an/LC_MESSAGES/gedit.mo
@@ -1705,6 +1484,7 @@ share/locale/br/LC_MESSAGES/gedit.mo
 share/locale/bs/LC_MESSAGES/gedit.mo
 share/locale/ca/LC_MESSAGES/gedit.mo
 share/locale/ca@valencia/LC_MESSAGES/gedit.mo
+share/locale/ckb/LC_MESSAGES/gedit.mo
 share/locale/crh/LC_MESSAGES/gedit.mo
 share/locale/cs/LC_MESSAGES/gedit.mo
 share/locale/cy/LC_MESSAGES/gedit.mo
@@ -1749,6 +1529,7 @@ share/locale/lv/LC_MESSAGES/gedit.mo
 share/locale/mai/LC_MESSAGES/gedit.mo
 share/locale/mg/LC_MESSAGES/gedit.mo
 share/locale/mi/LC_MESSAGES/gedit.mo
+share/locale/mjw/LC_MESSAGES/gedit.mo
 share/locale/mk/LC_MESSAGES/gedit.mo
 share/locale/ml/LC_MESSAGES/gedit.mo
 share/locale/mn/LC_MESSAGES/gedit.mo
@@ -1791,3 +1572,4 @@ share/locale/xh/LC_MESSAGES/gedit.mo
 share/locale/zh_CN/LC_MESSAGES/gedit.mo
 share/locale/zh_HK/LC_MESSAGES/gedit.mo
 share/locale/zh_TW/LC_MESSAGES/gedit.mo
+share/metainfo/org.gnome.gedit.appdata.xml
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 54521c802c1..5fac54131b7 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.57 2019/10/25 13:58:42 kamil Exp $
+$NetBSD: distinfo,v 1.58 2020/07/31 11:05:49 prlw1 Exp $
 
-SHA1 (gedit-3.22.1.tar.xz) = 10da4b317f0bb0577306e9d35f0d8a3b0185b2e8
-RMD160 (gedit-3.22.1.tar.xz) = 08f674e54adbffd31eed47ab09aeee41aaa41ad6
-SHA512 (gedit-3.22.1.tar.xz) = 7251732f353b1d9dab0fe447fe90b2259df34ff0694d8731ce3be531c21ac82ab6e7f4a07090aeef364640154f4ba6103539a253bc7942952dcf1e331418f0eb
-Size (gedit-3.22.1.tar.xz) = 2948048 bytes
+SHA1 (gedit-3.36.2.tar.xz) = 357fca82b0c9c811d5b1d07f0faac0e92c757d95
+RMD160 (gedit-3.36.2.tar.xz) = 8f8da4df2f7975c17631e385a54541bbcd38b11e
+SHA512 (gedit-3.36.2.tar.xz) = 20c3592aaf08ad4a5842b14ecb1eb0c9ddbef190412dc3f70b60bbf6125c9c4791a48260c89402ce4773720ae65b36fab510f9d1e104f548e243d11bc49279b5
+Size (gedit-3.36.2.tar.xz) = 14770004 bytes
+SHA1 (patch-gedit_meson.build) = f08366fd749fc7c74348d54e3f619d490318e50c
+SHA1 (patch-meson.build) = 9b964d44282671136c3e39331e3fd5dee25d767f
diff --git a/editors/gedit/options.mk b/editors/gedit/options.mk
deleted file mode 100644
index 99e6d3060e4..00000000000
--- a/editors/gedit/options.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: options.mk,v 1.6 2019/10/25 14:01:39 kamil Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.gedit
-PKG_SUPPORTED_OPTIONS=	enchant
-PKG_SUGGESTED_OPTIONS=	enchant
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS=		enchant
-
-###
-### Spell-check plugin which uses enchant
-### (gspell is a wrapper for enchant)
-###
-.if !empty(PKG_OPTIONS:Menchant)
-CONFIGURE_ARGS+=	--enable-spell
-.include "../../textproc/gspell/buildlink3.mk"
-PLIST.enchant=		yes
-.else
-CONFIGURE_ARGS+=	--disable-spell
-.endif
diff --git a/editors/gedit/patches/patch-gedit_meson.build b/editors/gedit/patches/patch-gedit_meson.build
new file mode 100644
index 00000000000..34ece12179c
--- /dev/null
+++ b/editors/gedit/patches/patch-gedit_meson.build
@@ -0,0 +1,16 @@
+$NetBSD: patch-gedit_meson.build,v 1.1 2020/07/31 11:05:49 prlw1 Exp $
+
+Install library in ${PREFIX}/lib, not ${PREFIX}/gedit/lib where
+no one will find it.
+
+--- gedit/meson.build.orig	2020-04-25 16:59:58.000000000 +0000
++++ gedit/meson.build
+@@ -186,7 +186,7 @@ libgedit_sha = shared_library(
+   c_args: libgedit_c_args,
+   link_args: libgedit_link_args,
+   install: true,
+-  install_dir: pkglibdir,
++  install_dir: libdir,
+ )
+ 
+ if generate_gir == true
diff --git a/editors/gedit/patches/patch-meson.build b/editors/gedit/patches/patch-meson.build
new file mode 100644
index 00000000000..f7f06b37425
--- /dev/null
+++ b/editors/gedit/patches/patch-meson.build
@@ -0,0 +1,18 @@
+$NetBSD: patch-meson.build,v 1.1 2020/07/31 11:05:49 prlw1 Exp $
+
+Don't insist that python binary is called 'python3'.
+
+--- meson.build.orig	2020-04-25 16:59:58.000000000 +0000
++++ meson.build
+@@ -69,7 +69,10 @@ x11_dep = dependency('x11', required: fa
+ introspection_dep = dependency('gobject-introspection-1.0', required: false)
+ vapigen_dep = dependency('vapigen', version: '>= 0.25.1', required: false)
+ 
+-python3 = python.find_installation('python3')
++python3 = python.find_installation('python3', required: false)
++if not python3.found()
++  python3 = python.find_installation()
++endif
+ 
+ build_checkupdate_plugin = host_machine.system() == 'windows'
+ if build_checkupdate_plugin