Attachment 232042 Details for Bug 262139 – poedit 3.0.1 patch

[patch] poedit 3.0.1 patch

poedit-3.0.1.patch (text/plain), 10.42 KB, created by Rodrigo Osorio on 2022-02-23 14:01:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rodrigo Osorio

Created: 2022-02-23 14:01:45 UTC

Size: 10.42 KB

patch

obsolete

>diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
>index 87ac1d751b95..d1b42332e63b 100644
>--- a/editors/poedit/Makefile
>+++ b/editors/poedit/Makefile
>@@ -2,8 +2,7 @@
> #    $MCom: ports/editors/poedit/Makefile,v 1.2 2006/10/05 07:03:09 mezz Exp $
> 
> PORTNAME=	poedit
>-PORTVERSION=	1.8.4
>-PORTREVISION=	35
>+PORTVERSION=	3.0.1
> CATEGORIES=	editors
> MASTER_SITES=	https://github.com/vslavik/${PORTNAME}/releases/download/v${PORTVERSION}-oss/
> 
>diff --git a/editors/poedit/distinfo b/editors/poedit/distinfo
>index c18eb2b153ee..43a900758261 100644
>--- a/editors/poedit/distinfo
>+++ b/editors/poedit/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (poedit-1.8.4.tar.gz) = d90a66c8717532b7565b5786c2d1d26f48024c5dab06d75f858212d947585914
>-SIZE (poedit-1.8.4.tar.gz) = 2319354
>+TIMESTAMP = 1645602671
>+SHA256 (poedit-3.0.1.tar.gz) = 61de1d99be51697a23dda0bbe04bd975a5a03b8390f13da9dbb6813c232efd39
>+SIZE (poedit-3.0.1.tar.gz) = 2962553
>diff --git a/editors/poedit/files/patch-src_gexecute.cpp b/editors/poedit/files/patch-src_gexecute.cpp
>deleted file mode 100644
>index c281c3a752a3..000000000000
>--- a/editors/poedit/files/patch-src_gexecute.cpp
>+++ /dev/null
>@@ -1,36 +0,0 @@
>---- src/gexecute.cpp.orig	2015-08-03 10:49:16 UTC
>-+++ src/gexecute.cpp
>-@@ -32,6 +32,8 @@
>- #include <wx/stdpaths.h>
>- #include <wx/filename.h>
>- 
>-+#include <sstream>
>-+
>- #include "gexecute.h"
>- #include "errors.h"
>- #include "chooselang.h"
>-@@ -49,6 +51,14 @@
>-     using std::regex_match;
>- #endif
>- 
>-+static int strtoi(const std::string& s)
>-+{
>-+  std::istringstream str(s);
>-+  int i;
>-+  str >> i;
>-+  return i;
>-+}
>-+
>- namespace
>- {
>- 
>-@@ -186,7 +196,8 @@ bool ExecuteGettextAndParseOutput(const 
>-         wsmatch match;
>-         if (regex_match(e, match, RE_ERROR))
>-         {
>--            rec.line = std::stoi(match.str(1));
>-+            std::string str(match.str(1).begin(),match.str(2).end());
>-+            rec.line = strtoi(str);
>-             rec.text = match.str(3);
>-             errors.push_back(rec);
>-             wxLogTrace("poedit.execute",
>diff --git a/editors/poedit/files/patch-src_http__client__casablanca.cpp b/editors/poedit/files/patch-src_http__client__casablanca.cpp
>deleted file mode 100644
>index b9dcc957edd6..000000000000
>--- a/editors/poedit/files/patch-src_http__client__casablanca.cpp
>+++ /dev/null
>@@ -1,40 +0,0 @@
>---- src/http_client_casablanca.cpp.orig	2015-08-03 10:49:16 UTC
>-+++ src/http_client_casablanca.cpp
>-@@ -30,10 +30,13 @@
>- 
>- #include <boost/algorithm/string/predicate.hpp>
>- 
>-+
>- #include <cpprest/asyncrt_utils.h>
>- #include <cpprest/http_client.h>
>- #include <cpprest/http_msg.h>
>- #include <cpprest/filestream.h>
>-+#include <sstream>
>-+
>- 
>- #ifdef _WIN32
>-     #include <windows.h>
>-@@ -66,6 +69,14 @@ struct json_dict::native
>-     }
>- };
>- 
>-+static trtoi(const std::string& s)
>-+{
>-+    std::istringstream str(s);
>-+    int i;
>-+    str >> i;
>-+    return i;
>-+}
>-+
>- static inline json_dict make_json_dict(const web::json::value& x)
>- {
>-     return std::make_shared<json_dict::native>(x);
>-@@ -102,7 +113,7 @@ int json_dict::number(const char *name) 
>-     {
>-         // Some broken APIs may return strings instead of numbers, so lets try
>-         // that too as a fallback
>--        return std::stoi(val.as_string());
>-+        return strtoi(val.as_string());
>-     }
>- }
>- 
>diff --git a/editors/poedit/files/patch-src_tm_dump__legacy__tm.cpp b/editors/poedit/files/patch-src_tm_dump__legacy__tm.cpp
>deleted file mode 100644
>index 0bade0d17730..000000000000
>--- a/editors/poedit/files/patch-src_tm_dump__legacy__tm.cpp
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- src/tm/dump_legacy_tm.cpp.orig	2015-08-03 10:49:16 UTC
>-+++ src/tm/dump_legacy_tm.cpp
>-@@ -28,6 +28,7 @@
>- #include <string>
>- #include <vector>
>- 
>-+#include <errno.h>
>- #include <string.h>
>- 
>- #ifdef DB_HEADER
>diff --git a/editors/poedit/pkg-plist b/editors/poedit/pkg-plist
>index 40c91dad22ae..24843ec035de 100644
>--- a/editors/poedit/pkg-plist
>+++ b/editors/poedit/pkg-plist
>@@ -1,43 +1,23 @@
> bin/poedit
>-libexec/poedit-dump-legacy-tm
> man/man1/poedit.1.gz
>-share/applications/poedit-uri.desktop
>-share/applications/poedit.desktop
>-share/icons/hicolor/16x16/apps/poedit.png
>-share/icons/hicolor/16x16/mimetypes/gnome-mime-text-x-gettext-translation.png
>-share/icons/hicolor/16x16/mimetypes/poedit-translation-generic.png
>-share/icons/hicolor/16x16/mimetypes/text-x-gettext-translation.png
>-share/icons/hicolor/22x22/apps/poedit.png
>-share/icons/hicolor/22x22/mimetypes/gnome-mime-text-x-gettext-translation.png
>-share/icons/hicolor/22x22/mimetypes/poedit-translation-generic.png
>-share/icons/hicolor/22x22/mimetypes/text-x-gettext-translation.png
>-share/icons/hicolor/24x24/apps/poedit.png
>-share/icons/hicolor/24x24/mimetypes/gnome-mime-text-x-gettext-translation.png
>-share/icons/hicolor/24x24/mimetypes/poedit-translation-generic.png
>-share/icons/hicolor/24x24/mimetypes/text-x-gettext-translation.png
>-share/icons/hicolor/32x32/apps/poedit.png
>-share/icons/hicolor/32x32/mimetypes/gnome-mime-text-x-gettext-translation.png
>-share/icons/hicolor/32x32/mimetypes/poedit-translation-generic.png
>-share/icons/hicolor/32x32/mimetypes/text-x-gettext-translation.png
>-share/icons/hicolor/48x48/apps/poedit.png
>-share/icons/hicolor/scalable/apps/poedit.svg
>-share/icons/hicolor/scalable/mimetypes/gnome-mime-text-x-gettext-translation.svg
>-share/icons/hicolor/scalable/mimetypes/poedit-translation-generic.svg
>-share/icons/hicolor/scalable/mimetypes/text-x-gettext-translation.svg
>+share/applications/net.poedit.Poedit.desktop
>+share/applications/net.poedit.PoeditURI.desktop
>+share/icons/hicolor/128x128/apps/net.poedit.Poedit.png
>+share/icons/hicolor/16x16/apps/net.poedit.Poedit.png
>+share/icons/hicolor/24x24/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/icon-theme.cache
>+share/icons/hicolor/scalable/apps/net.poedit.Poedit.svg
> share/locale/af/LC_MESSAGES/poedit.mo
>-share/locale/am/LC_MESSAGES/poedit.mo
> share/locale/an/LC_MESSAGES/poedit.mo
> share/locale/ar/LC_MESSAGES/poedit.mo
>-share/locale/ast/LC_MESSAGES/poedit.mo
> share/locale/az/LC_MESSAGES/poedit.mo
> share/locale/be/LC_MESSAGES/poedit.mo
> share/locale/be@latin/LC_MESSAGES/poedit.mo
> share/locale/bg/LC_MESSAGES/poedit.mo
>-share/locale/bn/LC_MESSAGES/poedit.mo
>-share/locale/br/LC_MESSAGES/poedit.mo
> share/locale/bs/LC_MESSAGES/poedit.mo
> share/locale/ca/LC_MESSAGES/poedit.mo
>-share/locale/ca@valencia/LC_MESSAGES/poedit.mo
> share/locale/ckb/LC_MESSAGES/poedit.mo
> share/locale/co/LC_MESSAGES/poedit.mo
> share/locale/cs/LC_MESSAGES/poedit.mo
>@@ -45,40 +25,31 @@ share/locale/da/LC_MESSAGES/poedit.mo
> share/locale/de/LC_MESSAGES/poedit.mo
> share/locale/el/LC_MESSAGES/poedit.mo
> share/locale/en_GB/LC_MESSAGES/poedit.mo
>-share/locale/eo/LC_MESSAGES/poedit.mo
> share/locale/es/LC_MESSAGES/poedit.mo
> share/locale/et/LC_MESSAGES/poedit.mo
> share/locale/eu/LC_MESSAGES/poedit.mo
> share/locale/fa/LC_MESSAGES/poedit.mo
> share/locale/fi/LC_MESSAGES/poedit.mo
> share/locale/fr/LC_MESSAGES/poedit.mo
>-share/locale/fur/LC_MESSAGES/poedit.mo
>-share/locale/fy_NL/LC_MESSAGES/poedit.mo
> share/locale/ga/LC_MESSAGES/poedit.mo
> share/locale/gl/LC_MESSAGES/poedit.mo
> share/locale/he/LC_MESSAGES/poedit.mo
>-share/locale/hi/LC_MESSAGES/poedit.mo
> share/locale/hr/LC_MESSAGES/poedit.mo
> share/locale/hu/LC_MESSAGES/poedit.mo
>+share/locale/hy/LC_MESSAGES/poedit.mo
> share/locale/id/LC_MESSAGES/poedit.mo
> share/locale/is/LC_MESSAGES/poedit.mo
> share/locale/it/LC_MESSAGES/poedit.mo
> share/locale/ja/LC_MESSAGES/poedit.mo
> share/locale/ka/LC_MESSAGES/poedit.mo
>+share/locale/kab/LC_MESSAGES/poedit.mo
> share/locale/kk/LC_MESSAGES/poedit.mo
> share/locale/ko/LC_MESSAGES/poedit.mo
>-share/locale/ku/LC_MESSAGES/poedit.mo
>-share/locale/ky/LC_MESSAGES/poedit.mo
> share/locale/lt/LC_MESSAGES/poedit.mo
> share/locale/lv/LC_MESSAGES/poedit.mo
>-share/locale/mk/LC_MESSAGES/poedit.mo
>-share/locale/mn/LC_MESSAGES/poedit.mo
>-share/locale/mr/LC_MESSAGES/poedit.mo
> share/locale/ms/LC_MESSAGES/poedit.mo
> share/locale/nb/LC_MESSAGES/poedit.mo
>-share/locale/ne/LC_MESSAGES/poedit.mo
> share/locale/nl/LC_MESSAGES/poedit.mo
>-share/locale/nn/LC_MESSAGES/poedit.mo
> share/locale/oc/LC_MESSAGES/poedit.mo
> share/locale/pa/LC_MESSAGES/poedit.mo
> share/locale/pl/LC_MESSAGES/poedit.mo
>@@ -91,37 +62,36 @@ share/locale/sl/LC_MESSAGES/poedit.mo
> share/locale/sq/LC_MESSAGES/poedit.mo
> share/locale/sr/LC_MESSAGES/poedit.mo
> share/locale/sv/LC_MESSAGES/poedit.mo
>-share/locale/ta/LC_MESSAGES/poedit.mo
> share/locale/tg/LC_MESSAGES/poedit.mo
> share/locale/th/LC_MESSAGES/poedit.mo
> share/locale/tr/LC_MESSAGES/poedit.mo
>-share/locale/tt/LC_MESSAGES/poedit.mo
>-share/locale/ug/LC_MESSAGES/poedit.mo
> share/locale/uk/LC_MESSAGES/poedit.mo
>-share/locale/ur/LC_MESSAGES/poedit.mo
> share/locale/uz/LC_MESSAGES/poedit.mo
> share/locale/vi/LC_MESSAGES/poedit.mo
>-share/locale/wa/LC_MESSAGES/poedit.mo
> share/locale/zh_CN/LC_MESSAGES/poedit.mo
> share/locale/zh_TW/LC_MESSAGES/poedit.mo
>-share/pixmaps/poedit.png
>-%%DATADIR%%/icons/CrowdinLogo.png
>-%%DATADIR%%/icons/PoeditWelcome.png
>-%%DATADIR%%/icons/SuggestionError.png
>-%%DATADIR%%/icons/SuggestionTM.png
>-%%DATADIR%%/icons/document-new.png
>+share/metainfo/net.poedit.Poedit.appdata.xml
>+%%DATADIR%%/icons/CrowdinLogoTemplate.png
>+%%DATADIR%%/icons/DownvoteTemplate.png
>+%%DATADIR%%/icons/ExtractorsGNUgettext.png
>+%%DATADIR%%/icons/ItemBookmarkTemplate.png
>+%%DATADIR%%/icons/ItemCommentTemplate.png
>+%%DATADIR%%/icons/StatusError.png
>+%%DATADIR%%/icons/StatusErrorBlack.png
>+%%DATADIR%%/icons/StatusWarning.png
>+%%DATADIR%%/icons/StatusWarningBlack.png
>+%%DATADIR%%/icons/SuggestionErrorTemplate.png
>+%%DATADIR%%/icons/SuggestionPerfectMatch.png
>+%%DATADIR%%/icons/SuggestionTMTemplate.png
> %%DATADIR%%/icons/document-open.png
>-%%DATADIR%%/icons/document-properties.png
> %%DATADIR%%/icons/document-save.png
>-%%DATADIR%%/icons/edit-delete.png
>-%%DATADIR%%/icons/poedit-fuzzy.png
>-%%DATADIR%%/icons/poedit-status-automatic.png
>-%%DATADIR%%/icons/poedit-status-bookmark.png
>+%%DATADIR%%/icons/hicolor/scalable/actions/poedit-sync-symbolic.svg
>+%%DATADIR%%/icons/hicolor/scalable/actions/poedit-update-symbolic.svg
>+%%DATADIR%%/icons/hicolor/scalable/actions/poedit-validate-symbolic.svg
>+%%DATADIR%%/icons/hicolor/scalable/actions/sidebar-symbolic.svg
> %%DATADIR%%/icons/poedit-status-cat-mid.png
> %%DATADIR%%/icons/poedit-status-cat-no.png
> %%DATADIR%%/icons/poedit-status-cat-ok.png
>-%%DATADIR%%/icons/poedit-status-comment.png
>-%%DATADIR%%/icons/poedit-status-nothing.png
> %%DATADIR%%/icons/poedit-sync.png
> %%DATADIR%%/icons/poedit-update.png
> %%DATADIR%%/icons/poedit-validate.png

Actions: View | Diff

Attachments on bug 262139: 232029 | 232042