Update to 1.20.1:

put peas_engine_enable_loader in the correct place
Fix: make the list of recently used files working again
drop unused variables
pluma-spell-checker-language.c: Fix build warning:
pluma.c: Fix build warning:
pluma-document.c: Fix build warning:
pluma-window: have GtkRecentData on stack instead of allocating it
WidthOfScreen and HeightOfScreen implementation
Fixes for regexp replacement with backreferences (e.g. "\0")
pluma-view.c: use one static variable instead two to do the same job
make sure pluma open in the same window of the workspace
Fix: pluma closes tabs unexpectedly with [right + middle] click ctrl + + / ctrl + - using the numeric keypad
add gsettings key: Show save confirmation if the files have changes
Fix: wrong behavior holding down [middle + right] click ctrl + + / ctrl + - to increase/decrease font size
don’t request to save documents with no changes
add gsettings key to hide/show(default) tabs with the side pane
Hide tabs if we are using the sidebar
gtk 3.22: avoid deprecated gdk_screen_get_monitor functions:
avoid deprecated gdk_screen_get_width/height
avoid deprecated gdk_screen_make_display_name
pluma-help: don’t use deprecated gtk_show_uri
filebrowser: don’t use deprecated gtk_show_uri
avoid deprecated gdk_display_get_screen and gdk_screen_get_number
enable the abbility to save the document if it was changed externally
disable the abbility to save the document if it has no changes
print-preferences UI: fix some basic deprecations
encoding-dialog UI: fix some basic deprecations
preferences-dialog UI: fix some basic deprecations
pluma-panel: remove deprecated GtkImage types
plumal-panel: remove some GtkStock deprecations
search-dialogs: fix a -Wpointer-compare warning
tag-list-plugin: avoid deprecated GtkStock
file-browser-widget: fix one stock deprecation
configure: drop GLIB_VERSION_MAX_ALLOWED
File browser: don’t use GIOScheduler (deprecated)
file-browser-view: silent some build warnings
pluma-view: avoid GtkStock deprecations
pluma-tab: replace some GtkStock icons
pluma-notebook: don’t use deprecated gdk_cursor_new
progress-message-area: fix one GtkStock deprecation
io-error-message-dialog: fix some GtkStock deprecation warnings
Fix: pluma closes tabs unexpectedly with middle click
pluma-notebook.c: fix a build warning
double click to the right of the last open tab to open a new tab
Support new location of gtk bookmarks file
docs: we have encodings combobox, not option menu
remove references to PlumaStatus
docs: remove some references to nonexistent stuff
filebrowser: don’t parse .hidden files - GIO does it since 2.36
close confirm dialog: enable selection + disable focus in all labels
close confirm dialog: set max width for labels
fix typo in code comments
fix running under wayland
modelines: fix random crash on closing one of several Pluma windows
Translations update

4 files changed, 13 insertions, 14 deletions

diff --git a/editors/pluma/Makefile b/editors/pluma/Makefile
index 657146bca59..79204a51f73 100644
--- a/editors/pluma/Makefile
+++ b/editors/pluma/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/04/16 14:34:24 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2018/05/14 13:23:50 youri Exp $
 
 # XXX: meta-pkgs/mate/Makefile.common includes pyversion.mk which sets the
 # python version too early and clashes with PYTHON_VERSIONS_INCOMPATIBLE
@@ -7,8 +7,7 @@
 .include "../../devel/libpeas/buildlink3.mk"
 .include "../../meta-pkgs/mate/Makefile.common"
 
-DISTNAME=	pluma-${VERSION:R}.2
-PKGREVISION=	4
+DISTNAME=	pluma-${VERSION:R}.1
 CATEGORIES=	editors
 
 COMMENT=	Small and lightweight UTF-8 text editor for the MATE
diff --git a/editors/pluma/PLIST b/editors/pluma/PLIST
index 45667e764e2..b676916df56 100644
--- a/editors/pluma/PLIST
+++ b/editors/pluma/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2017/06/23 17:32:16 youri Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/05/14 13:23:50 youri Exp $
 bin/pluma
 include/pluma/pluma-app.h
 include/pluma/pluma-commands.h
@@ -151,10 +151,9 @@ share/gtk-doc/html/pluma/left-insensitive.png
 share/gtk-doc/html/pluma/left.png
 share/gtk-doc/html/pluma/pluma-PlumaPrintJob.html
 share/gtk-doc/html/pluma/pluma-pluma-app.html
-share/gtk-doc/html/pluma/pluma-pluma-convert.html
 share/gtk-doc/html/pluma/pluma-pluma-debug.html
 share/gtk-doc/html/pluma/pluma-pluma-document.html
-share/gtk-doc/html/pluma/pluma-pluma-encodings-option-menu.html
+share/gtk-doc/html/pluma/pluma-pluma-encodings-combo-box.html
 share/gtk-doc/html/pluma/pluma-pluma-encodings.html
 share/gtk-doc/html/pluma/pluma-pluma-file-chooser-dialog.html
 share/gtk-doc/html/pluma/pluma-pluma-help.html
@@ -403,6 +402,7 @@ share/locale/eu/LC_MESSAGES/pluma.mo
 share/locale/fa/LC_MESSAGES/pluma.mo
 share/locale/fi/LC_MESSAGES/pluma.mo
 share/locale/fr/LC_MESSAGES/pluma.mo
+share/locale/fr_CA/LC_MESSAGES/pluma.mo
 share/locale/ga/LC_MESSAGES/pluma.mo
 share/locale/gl/LC_MESSAGES/pluma.mo
 share/locale/gu/LC_MESSAGES/pluma.mo
@@ -415,6 +415,7 @@ share/locale/id/LC_MESSAGES/pluma.mo
 share/locale/is/LC_MESSAGES/pluma.mo
 share/locale/it/LC_MESSAGES/pluma.mo
 share/locale/ja/LC_MESSAGES/pluma.mo
+share/locale/jv/LC_MESSAGES/pluma.mo
 share/locale/ka/LC_MESSAGES/pluma.mo
 share/locale/kk/LC_MESSAGES/pluma.mo
 share/locale/kn/LC_MESSAGES/pluma.mo
diff --git a/editors/pluma/distinfo b/editors/pluma/distinfo
index 3faa5a9e5b4..958d1a30a55 100644
--- a/editors/pluma/distinfo
+++ b/editors/pluma/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2017/06/23 17:32:16 youri Exp $
+$NetBSD: distinfo,v 1.3 2018/05/14 13:23:50 youri Exp $
 
-SHA1 (pluma-1.18.2.tar.xz) = aca7de8f06c26f4a0c807aafd3a862494a050647
-RMD160 (pluma-1.18.2.tar.xz) = 157baecf9e4c2b8a93cb3ac7e4d68ed5a8cdf9e9
-SHA512 (pluma-1.18.2.tar.xz) = 285170531c92ad13fdd35286c06de62b75f0426a830c51f4f54799b4b5377d65b3e1fd1e1af3827462a356947e853e4203a4ed394a8b6137bbd87e289f490b6d
-Size (pluma-1.18.2.tar.xz) = 3348500 bytes
+SHA1 (pluma-1.20.1.tar.xz) = 88bf75cff72fc99e179abd1c9e61b31e0ec44bfb
+RMD160 (pluma-1.20.1.tar.xz) = 85523e93007675c7e46bea5fd856b1ba43dd8b06
+SHA512 (pluma-1.20.1.tar.xz) = 7782fd227524e524b4e97eb196f01085d5bd5dd0d3d91bae21742ba4da6496fe13c2669606265932c323a34ea007d0c0164f79783d5bb5dde049ce40fc1b2b1d
+Size (pluma-1.20.1.tar.xz) = 3414916 bytes
diff --git a/editors/pluma/options.mk b/editors/pluma/options.mk
index 1614fe0c73f..1ee3268e04c 100644
--- a/editors/pluma/options.mk
+++ b/editors/pluma/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2017/06/29 19:37:26 jperkin Exp $
+# $NetBSD: options.mk,v 1.6 2018/05/14 13:23:50 youri Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pluma
 PKG_SUPPORTED_OPTIONS=	enchant
@@ -27,7 +27,6 @@ REPLACE_PYTHON+=	plugins/externaltools/data/switch-c.tool.in
 REPLACE_BASH+=	plugins/externaltools/data/search-recursive.tool.in
 PLIST.python=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gtk2, also via py-gtksourceview
-.include "../../lang/python/application.mk"
 .include "../../devel/py-gobject/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../x11/py-gtksourceview/buildlink3.mk"
@@ -36,5 +35,5 @@ CONFIGURE_ARGS+=	--disable-python
 # XXX: Due to the mess described above, and the fact that python is required
 # by the build process but is not python3 compatible, we need to override and
 # use python2.7 explicitly.
-PYTHONBIN=		${LOCALBASE}/bin/python2.7
+PYTHONBIN=		${PREFIX}/bin/python2.7
 .endif