deskutils/{g}xneur: Update to 0.20

PR:	239859
Submitted by:	mizhka@gmail.com (maintainer)

5 files changed, 53 insertions, 42 deletions

diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile
index d6f474cca75e..fd27dc10b925 100644
--- a/deskutils/xneur/Makefile
+++ b/deskutils/xneur/Makefile
@@ -2,26 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=	xneur
-PORTVERSION=	0.17.0
+PORTVERSION=	0.20.0
 DISTVERSIONSUFFIX=.orig
-PORTREVISION=	7
 CATEGORIES=	deskutils
 MASTER_SITES=	https://launchpad.net/~andrew-crew-kuznetsov/+archive/xneur-stable/+files/
 DISTNAME=	${PORTNAME}_${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mizhka@gmail.com
 COMMENT=	Auto keyboard switcher
 
 LICENSE=	GPLv2
 
+BUILD_DEPENDS=	intltool-update:textproc/intltool
 LIB_DEPENDS=	libnotify.so:devel/libnotify \
 		libpcre.so:devel/pcre
 
 USES=		compiler:nestedfct gnome iconv libtool localbase pathfix \
-		pkgconfig
+		pkgconfig xorg
+USE_GNOME=	gtk20
+
+USE_XORG=	xtst
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-static --libdir=${PREFIX}/lib/xneur
+CONFIGURE_ARGS=	--disable-static --libdir=${PREFIX}/lib/xneur --with-gtk=gtk2
 CFLAGS_mips=	-fnested-functions
 CFLAGS_mips64=	-fnested-functions
 CFLAGS_powerpc=	-fnested-functions
diff --git a/deskutils/xneur/distinfo b/deskutils/xneur/distinfo
index 62f6e27851de..72649709650f 100644
--- a/deskutils/xneur/distinfo
+++ b/deskutils/xneur/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xneur_0.17.0.orig.tar.gz) = b5243e401239505c449a6a2671a0d42c05deabac8ef7442d4a7ca8236137a8ab
-SIZE (xneur_0.17.0.orig.tar.gz) = 1669034
+TIMESTAMP = 1565792030
+SHA256 (xneur_0.20.0.orig.tar.gz) = f9f6a0e834c6e28d0611f12c9fcc712831ced3701e31b77b71a9cf9be2c5e3d1
+SIZE (xneur_0.20.0.orig.tar.gz) = 1683789
diff --git a/deskutils/xneur/files/patch-etc-Makefile.in b/deskutils/xneur/files/patch-etc-Makefile.in
index 8613c5f35163..7b1a48f835d4 100644
--- a/deskutils/xneur/files/patch-etc-Makefile.in
+++ b/deskutils/xneur/files/patch-etc-Makefile.in
@@ -1,6 +1,6 @@
---- etc/Makefile.in.orig	2015-06-22 10:21:10 UTC
+--- etc/Makefile.in.orig	2019-08-14 14:23:32 UTC
 +++ etc/Makefile.in
-@@ -259,7 +259,7 @@ top_builddir = @top_builddir@
+@@ -330,7 +330,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  xneurrcdir = $(sysconfdir)/xneur
  xneurrc_DATA = \
diff --git a/deskutils/xneur/files/patch-lib_main_program.c b/deskutils/xneur/files/patch-lib_main_program.c
new file mode 100644
index 000000000000..0acc11284598
--- /dev/null
+++ b/deskutils/xneur/files/patch-lib_main_program.c
@@ -0,0 +1,11 @@
+--- lib/main/program.c.orig	2020-03-26 11:56:18 UTC
++++ lib/main/program.c
+@@ -445,7 +445,7 @@ static void program_process_input(struct _program *p)
+ 			#ifdef WITH_ASPELL
+ 					if (xconfig->handle->has_spell_checker[lang])
+ 					{
+-						loKg_message(DEBUG, _("      %s aspell dictionary loaded"), lang_name);
++						log_message(DEBUG, _("      %s aspell dictionary loaded"), lang_name);
+ 					}
+ 					else
+ 					{
diff --git a/deskutils/xneur/pkg-plist b/deskutils/xneur/pkg-plist
index e92777f5ec5a..c16acafb4784 100644
--- a/deskutils/xneur/pkg-plist
+++ b/deskutils/xneur/pkg-plist
@@ -1,29 +1,30 @@
 bin/xneur
 @sample %%ETCDIR%%/xneurrc.sample
-lib/xneur/libxneur.so.17.0.0
-lib/xneur/libxneur.so.17
-lib/xneur/libxneur.so
-lib/xneur/libxnconfig.so.17.0.0
-lib/xneur/libxnconfig.so.17
+include/xneur/list_char.h
+include/xneur/xnconfig.h
+include/xneur/xneur.h
 lib/xneur/libxnconfig.so
-lib/xneur/xneur/libxntest.so.0.0.0
-lib/xneur/xneur/libxntest.so.0
-lib/xneur/xneur/libxntest.so
-lib/xneur/xneur/libxnstatistic.so.0.0.0
-lib/xneur/xneur/libxnstatistic.so.0
+lib/xneur/libxnconfig.so.20
+lib/xneur/libxnconfig.so.20.0.0
+lib/xneur/libxneur.so
+lib/xneur/libxneur.so.20
+lib/xneur/libxneur.so.20.0.0
 lib/xneur/xneur/libxnstatistic.so
+lib/xneur/xneur/libxnstatistic.so.0
+lib/xneur/xneur/libxnstatistic.so.0.0.0
+lib/xneur/xneur/libxntest.so
+lib/xneur/xneur/libxntest.so.0
+lib/xneur/xneur/libxntest.so.0.0.0
+libdata/pkgconfig/xnconfig.pc
+libdata/pkgconfig/xneur.pc
 man/man1/xneur.1.gz
 man/man5/xneurrc.5.gz
-include/xneur/list_char.h
-include/xneur/xneur.h
-include/xneur/xnconfig.h
-%%DATADIR%%/sounds/layout1.wav
-%%DATADIR%%/sounds/layout2.wav
-%%DATADIR%%/sounds/layout1type.wav
-%%DATADIR%%/sounds/layout2type.wav
-%%DATADIR%%/sounds/replace.wav
-%%DATADIR%%/sounds/switch.wav
-%%DATADIR%%/sounds/itemback.wav
+share/icons/hicolor/16x16/apps/xneur.png
+share/icons/hicolor/22x22/apps/xneur.png
+share/icons/hicolor/24x24/apps/xneur.png
+share/icons/hicolor/32x32/apps/xneur.png
+share/icons/hicolor/48x48/apps/xneur.png
+share/icons/hicolor/scalable/apps/xneur.svg
 %%DATADIR%%/languages/am/dictionary
 %%DATADIR%%/languages/am/proto
 %%DATADIR%%/languages/am/proto3
@@ -87,16 +88,10 @@ include/xneur/xnconfig.h
 %%DATADIR%%/languages/uz/dictionary
 %%DATADIR%%/languages/uz/proto
 %%DATADIR%%/languages/uz/proto3
-%%NLS%%share/locale/be/LC_MESSAGES/xneur.mo
-%%NLS%%share/locale/de/LC_MESSAGES/xneur.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/xneur.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/xneur.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/xneur.mo
-libdata/pkgconfig/xneur.pc
-libdata/pkgconfig/xnconfig.pc
-share/icons/hicolor/16x16/apps/xneur.png
-share/icons/hicolor/22x22/apps/xneur.png
-share/icons/hicolor/24x24/apps/xneur.png
-share/icons/hicolor/32x32/apps/xneur.png
-share/icons/hicolor/48x48/apps/xneur.png
-share/icons/hicolor/scalable/apps/xneur.svg
+%%DATADIR%%/sounds/itemback.wav
+%%DATADIR%%/sounds/layout1.wav
+%%DATADIR%%/sounds/layout1type.wav
+%%DATADIR%%/sounds/layout2.wav
+%%DATADIR%%/sounds/layout2type.wav
+%%DATADIR%%/sounds/replace.wav
+%%DATADIR%%/sounds/switch.wav