poedit: update to 2.2.3.

Version 2.2.3
-------------

- Fixed asserts when compiled against wxGTK 3.0.
- [Windows] Fixed issue where custom font wasn't respected in some cases.


Version 2.2.2
-------------

- [Windows] Fix problem with some MSIE proxy configurations not being imported.
- [Windows] Performance improvements.
- Assorted bugfixes.


Version 2.2.1
-------------

- Improved highlighting of HTML and placeholders.
- File references are now supported in XLIFF.
- [Linux] Compatibility fixes for Wayland, wxGTK 3.0 and dark themes.


Version 2.2
-----------

- Support for editing XLIFF (both 1.2 and 2) files.
- Fixes for correct handling of dark themes, including on macOS Mojave.
- [Linux] Improved appearance with GTK+ 3.
- [Linux] Updated AppData and desktop files to use reverse DNS naming.


Version 2.1.1
-------------

- Fixed breakage of some localizations on macOS.


Version 2.1
-----------

- Added import and export of translation memory as TMX files.
- Added ability to delete bad translations from the TM.
- TM now has limited support for plural forms (only nplurals<=2).
- Improved handling plural form rules. CLDR is now used as the data source and
  expressions are checked for equivalence before warning about unusual forms.


Version 2.0.9
-------------

- Improved dark theme supports (still not perfect).
- Fix broken list rendering of RTL text on Windows.


Version 2.0.8
-------------

- Add CakePHP support.
- QA warnings and RTL fixes.
- Make TM reset work when the index is corrupted.


Version 2.0.7
-------------

- Fix mangled non-English gettext error messages.
- Add inline explanation of custom extractors syntax.


Version 2.0.6
-------------

- Fix hanging with certain rare (non-UTF8, non-ASCII msgids) PO files.


Version 2.0.5
-------------

- [macOS] Fixed crashing bug on macOS.
- [Windows] Improved HiDPI support.
- Assorted bugfixes.


Version 2.0.4
-------------

- Added support for Crowdin branches.
- Poedit now remembers your pre-translation settings.

5 files changed, 54 insertions, 38 deletions

diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 33c9ba27031..cd4008d083b 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.82 2019/04/03 00:32:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.83 2019/05/21 17:44:46 wiz Exp $
 
-DISTNAME=	poedit-2.0.3
-PKGREVISION=	17
+DISTNAME=	poedit-2.2.3
 CATEGORIES=	editors
 MASTER_SITES=	https://github.com/vslavik/poedit/releases/download/v${PKGVERSION_NOREV}-oss/
 
@@ -27,5 +26,6 @@ BUILDLINK_TRANSFORM+=	rm:-Wextra
 .include "../../textproc/lucene++/buildlink3.mk"
 .include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/poedit/PLIST b/editors/poedit/PLIST
index b35942d9240..944f42253b6 100644
--- a/editors/poedit/PLIST
+++ b/editors/poedit/PLIST
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.8 2017/09/16 08:39:59 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.9 2019/05/21 17:44:46 wiz Exp $
 bin/poedit
 man/man1/poedit.1
-share/appdata/poedit.appdata.xml
-share/applications/poedit-uri.desktop
-share/applications/poedit.desktop
-share/icons/hicolor/16x16/apps/poedit.png
-share/icons/hicolor/24x24/apps/poedit.png
-share/icons/hicolor/256x256/apps/poedit.png
-share/icons/hicolor/32x32/apps/poedit.png
-share/icons/hicolor/48x48/apps/poedit.png
-share/icons/hicolor/512x512/apps/poedit.png
+share/applications/net.poedit.Poedit.desktop
+share/applications/net.poedit.PoeditURI.desktop
+share/icons/hicolor/16x16/apps/net.poedit.Poedit.png
+share/icons/hicolor/24x24/apps/net.poedit.Poedit.png
+share/icons/hicolor/256x256/apps/net.poedit.Poedit.png
+share/icons/hicolor/32x32/apps/net.poedit.Poedit.png
+share/icons/hicolor/48x48/apps/net.poedit.Poedit.png
+share/icons/hicolor/512x512/apps/net.poedit.Poedit.png
+share/locale/af/LC_MESSAGES/poedit.mo
 share/locale/an/LC_MESSAGES/poedit.mo
 share/locale/ar/LC_MESSAGES/poedit.mo
 share/locale/az/LC_MESSAGES/poedit.mo
@@ -70,35 +70,32 @@ share/locale/uz/LC_MESSAGES/poedit.mo
 share/locale/vi/LC_MESSAGES/poedit.mo
 share/locale/zh_CN/LC_MESSAGES/poedit.mo
 share/locale/zh_TW/LC_MESSAGES/poedit.mo
-share/pixmaps/poedit.png
-share/poedit/icons/CrowdinLogo.png
+share/metainfo/net.poedit.Poedit.appdata.xml
+share/poedit/icons/CrowdinLogoTemplate.png
+share/poedit/icons/DownvoteTemplate.png
 share/poedit/icons/ExtractorsGNUgettext.png
-share/poedit/icons/ExtractorsGNUgettext@2x.png
+share/poedit/icons/ItemBookmarkTemplate.png
+share/poedit/icons/ItemCommentTemplate.png
 share/poedit/icons/PoeditWelcome.png
-share/poedit/icons/SuggestionError.png
+share/poedit/icons/StatusError.png
+share/poedit/icons/StatusErrorBlack.png
+share/poedit/icons/StatusWarning.png
+share/poedit/icons/StatusWarningBlack.png
+share/poedit/icons/SuggestionErrorTemplate.png
 share/poedit/icons/SuggestionPerfectMatch.png
-share/poedit/icons/SuggestionPerfectMatch@2x.png
-share/poedit/icons/SuggestionTM.png
+share/poedit/icons/SuggestionTMTemplate.png
 share/poedit/icons/document-new.png
 share/poedit/icons/document-open.png
 share/poedit/icons/document-properties.png
 share/poedit/icons/document-save.png
 share/poedit/icons/edit-delete.png
-share/poedit/icons/poedit-status-bookmark-selected.png
-share/poedit/icons/poedit-status-bookmark-selected@2x.png
-share/poedit/icons/poedit-status-bookmark.png
-share/poedit/icons/poedit-status-bookmark@2x.png
+share/poedit/icons/hicolor/scalable/actions/poedit-sync-symbolic.svg
+share/poedit/icons/hicolor/scalable/actions/poedit-update-symbolic.svg
+share/poedit/icons/hicolor/scalable/actions/poedit-validate-symbolic.svg
+share/poedit/icons/hicolor/scalable/actions/sidebar-symbolic.svg
 share/poedit/icons/poedit-status-cat-mid.png
 share/poedit/icons/poedit-status-cat-no.png
 share/poedit/icons/poedit-status-cat-ok.png
-share/poedit/icons/poedit-status-comment-selected.png
-share/poedit/icons/poedit-status-comment-selected@2x.png
-share/poedit/icons/poedit-status-comment.png
-share/poedit/icons/poedit-status-comment@2x.png
-share/poedit/icons/poedit-status-error.png
-share/poedit/icons/poedit-status-error@2x.png
-share/poedit/icons/poedit-status-warning.png
-share/poedit/icons/poedit-status-warning@2x.png
 share/poedit/icons/poedit-sync.png
 share/poedit/icons/poedit-update.png
 share/poedit/icons/poedit-validate.png
diff --git a/editors/poedit/distinfo b/editors/poedit/distinfo
index ec92d12e24e..43aa18cc3d0 100644
--- a/editors/poedit/distinfo
+++ b/editors/poedit/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2017/09/16 08:39:59 ryoon Exp $
+$NetBSD: distinfo,v 1.11 2019/05/21 17:44:46 wiz Exp $
 
-SHA1 (poedit-2.0.3.tar.gz) = fdd155ea8654813d5a931fc923b1e0edb9d482ec
-RMD160 (poedit-2.0.3.tar.gz) = bb17292544232b2d468fbe97d0de5bf299773499
-SHA512 (poedit-2.0.3.tar.gz) = 513f3b312dfbe3fdeb6970d5fcae9004fd6655fa097364e9aa38f95f939ccb72fedea13fbcdcd1f522470fc7504fb1c452e03b207890af251e75e4a417e45830
-Size (poedit-2.0.3.tar.gz) = 2526838 bytes
-SHA1 (patch-aa) = 4c7d373091e6508a0791e4c01864f79a770e1bde
+SHA1 (poedit-2.2.3.tar.gz) = 4675bb29b7b1f7e2eada68355273ee0d36bb19a6
+RMD160 (poedit-2.2.3.tar.gz) = 682c7ef9bde1c75e3cb5088a79066ce29febc73c
+SHA512 (poedit-2.2.3.tar.gz) = 566f397add593d0b05b995cbd1cff1b063b6eb49b02058511f13c27ed5887685816f8dd9280e1a6be2dd594049c6eecd73efc5cf7835475d3cb5a94fe38f280f
+Size (poedit-2.2.3.tar.gz) = 2834106 bytes
+SHA1 (patch-aa) = ec8d4d55bbfdd890c126e2f742fd83e3612170f2
+SHA1 (patch-src_welcomescreen.cpp) = bd8ef11e4b6bae515a3bbb241bacef1f779a410d
diff --git a/editors/poedit/patches/patch-aa b/editors/poedit/patches/patch-aa
index c1d46e72321..20d6611a0d3 100644
--- a/editors/poedit/patches/patch-aa
+++ b/editors/poedit/patches/patch-aa
@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.5 2017/09/16 08:39:59 ryoon Exp $
+$NetBSD: patch-aa,v 1.6 2019/05/21 17:44:46 wiz Exp $
+
+Fix unportable test(1) operator.
+https://github.com/vslavik/poedit/pull/575
 
 --- configure.orig	2017-07-23 17:10:09.000000000 +0000
 +++ configure
diff --git a/editors/poedit/patches/patch-src_welcomescreen.cpp b/editors/poedit/patches/patch-src_welcomescreen.cpp
new file mode 100644
index 00000000000..ed0d6e8bf53
--- /dev/null
+++ b/editors/poedit/patches/patch-src_welcomescreen.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_welcomescreen.cpp,v 1.1 2019/05/21 17:44:46 wiz Exp $
+
+Add header for LearnMoreLink.
+https://github.com/vslavik/poedit/pull/576
+
+--- src/welcomescreen.cpp.orig	2019-05-20 11:39:34.000000000 +0000
++++ src/welcomescreen.cpp
+@@ -26,6 +26,7 @@
+ #include "welcomescreen.h"
+ 
+ #include "colorscheme.h"
++#include "customcontrols.h"
+ #include "crowdin_gui.h"
+ #include "edapp.h"
+ #include "edframe.h"