View | Details | Raw Unified | Return to bug 262139 | Differences between
and this patch

Collapse All | Expand All

(-)b/editors/poedit/Makefile (-2 / +1 lines)
Lines 2-9 Link Here
2
#    $MCom: ports/editors/poedit/Makefile,v 1.2 2006/10/05 07:03:09 mezz Exp $
2
#    $MCom: ports/editors/poedit/Makefile,v 1.2 2006/10/05 07:03:09 mezz Exp $
3
3
4
PORTNAME=	poedit
4
PORTNAME=	poedit
5
PORTVERSION=	1.8.4
5
PORTVERSION=	3.0.1
6
PORTREVISION=	35
7
CATEGORIES=	editors
6
CATEGORIES=	editors
8
MASTER_SITES=	https://github.com/vslavik/${PORTNAME}/releases/download/v${PORTVERSION}-oss/
7
MASTER_SITES=	https://github.com/vslavik/${PORTNAME}/releases/download/v${PORTVERSION}-oss/
9
8
(-)b/editors/poedit/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (poedit-1.8.4.tar.gz) = d90a66c8717532b7565b5786c2d1d26f48024c5dab06d75f858212d947585914
1
TIMESTAMP = 1645602671
2
SIZE (poedit-1.8.4.tar.gz) = 2319354
2
SHA256 (poedit-3.0.1.tar.gz) = 61de1d99be51697a23dda0bbe04bd975a5a03b8390f13da9dbb6813c232efd39
3
SIZE (poedit-3.0.1.tar.gz) = 2962553
(-)a/editors/poedit/files/patch-src_gexecute.cpp (-36 lines)
Removed Link Here
1
--- src/gexecute.cpp.orig	2015-08-03 10:49:16 UTC
2
+++ src/gexecute.cpp
3
@@ -32,6 +32,8 @@
4
 #include <wx/stdpaths.h>
5
 #include <wx/filename.h>
6
 
7
+#include <sstream>
8
+
9
 #include "gexecute.h"
10
 #include "errors.h"
11
 #include "chooselang.h"
12
@@ -49,6 +51,14 @@
13
     using std::regex_match;
14
 #endif
15
 
16
+static int strtoi(const std::string& s)
17
+{
18
+  std::istringstream str(s);
19
+  int i;
20
+  str >> i;
21
+  return i;
22
+}
23
+
24
 namespace
25
 {
26
 
27
@@ -186,7 +196,8 @@ bool ExecuteGettextAndParseOutput(const 
28
         wsmatch match;
29
         if (regex_match(e, match, RE_ERROR))
30
         {
31
-            rec.line = std::stoi(match.str(1));
32
+            std::string str(match.str(1).begin(),match.str(2).end());
33
+            rec.line = strtoi(str);
34
             rec.text = match.str(3);
35
             errors.push_back(rec);
36
             wxLogTrace("poedit.execute",
(-)a/editors/poedit/files/patch-src_http__client__casablanca.cpp (-40 lines)
Removed Link Here
1
--- src/http_client_casablanca.cpp.orig	2015-08-03 10:49:16 UTC
2
+++ src/http_client_casablanca.cpp
3
@@ -30,10 +30,13 @@
4
 
5
 #include <boost/algorithm/string/predicate.hpp>
6
 
7
+
8
 #include <cpprest/asyncrt_utils.h>
9
 #include <cpprest/http_client.h>
10
 #include <cpprest/http_msg.h>
11
 #include <cpprest/filestream.h>
12
+#include <sstream>
13
+
14
 
15
 #ifdef _WIN32
16
     #include <windows.h>
17
@@ -66,6 +69,14 @@ struct json_dict::native
18
     }
19
 };
20
 
21
+static trtoi(const std::string& s)
22
+{
23
+    std::istringstream str(s);
24
+    int i;
25
+    str >> i;
26
+    return i;
27
+}
28
+
29
 static inline json_dict make_json_dict(const web::json::value& x)
30
 {
31
     return std::make_shared<json_dict::native>(x);
32
@@ -102,7 +113,7 @@ int json_dict::number(const char *name) 
33
     {
34
         // Some broken APIs may return strings instead of numbers, so lets try
35
         // that too as a fallback
36
-        return std::stoi(val.as_string());
37
+        return strtoi(val.as_string());
38
     }
39
 }
40
 
(-)a/editors/poedit/files/patch-src_tm_dump__legacy__tm.cpp (-10 lines)
Removed Link Here
1
--- src/tm/dump_legacy_tm.cpp.orig	2015-08-03 10:49:16 UTC
2
+++ src/tm/dump_legacy_tm.cpp
3
@@ -28,6 +28,7 @@
4
 #include <string>
5
 #include <vector>
6
 
7
+#include <errno.h>
8
 #include <string.h>
9
 
10
 #ifdef DB_HEADER
(-)b/editors/poedit/pkg-plist (-58 / +28 lines)
Lines 1-43 Link Here
1
bin/poedit
1
bin/poedit
2
libexec/poedit-dump-legacy-tm
3
man/man1/poedit.1.gz
2
man/man1/poedit.1.gz
4
share/applications/poedit-uri.desktop
3
share/applications/net.poedit.Poedit.desktop
5
share/applications/poedit.desktop
4
share/applications/net.poedit.PoeditURI.desktop
6
share/icons/hicolor/16x16/apps/poedit.png
5
share/icons/hicolor/128x128/apps/net.poedit.Poedit.png
7
share/icons/hicolor/16x16/mimetypes/gnome-mime-text-x-gettext-translation.png
6
share/icons/hicolor/16x16/apps/net.poedit.Poedit.png
8
share/icons/hicolor/16x16/mimetypes/poedit-translation-generic.png
7
share/icons/hicolor/24x24/apps/net.poedit.Poedit.png
9
share/icons/hicolor/16x16/mimetypes/text-x-gettext-translation.png
8
share/icons/hicolor/32x32/apps/net.poedit.Poedit.png
10
share/icons/hicolor/22x22/apps/poedit.png
9
share/icons/hicolor/48x48/apps/net.poedit.Poedit.png
11
share/icons/hicolor/22x22/mimetypes/gnome-mime-text-x-gettext-translation.png
10
share/icons/hicolor/icon-theme.cache
12
share/icons/hicolor/22x22/mimetypes/poedit-translation-generic.png
11
share/icons/hicolor/scalable/apps/net.poedit.Poedit.svg
13
share/icons/hicolor/22x22/mimetypes/text-x-gettext-translation.png
14
share/icons/hicolor/24x24/apps/poedit.png
15
share/icons/hicolor/24x24/mimetypes/gnome-mime-text-x-gettext-translation.png
16
share/icons/hicolor/24x24/mimetypes/poedit-translation-generic.png
17
share/icons/hicolor/24x24/mimetypes/text-x-gettext-translation.png
18
share/icons/hicolor/32x32/apps/poedit.png
19
share/icons/hicolor/32x32/mimetypes/gnome-mime-text-x-gettext-translation.png
20
share/icons/hicolor/32x32/mimetypes/poedit-translation-generic.png
21
share/icons/hicolor/32x32/mimetypes/text-x-gettext-translation.png
22
share/icons/hicolor/48x48/apps/poedit.png
23
share/icons/hicolor/scalable/apps/poedit.svg
24
share/icons/hicolor/scalable/mimetypes/gnome-mime-text-x-gettext-translation.svg
25
share/icons/hicolor/scalable/mimetypes/poedit-translation-generic.svg
26
share/icons/hicolor/scalable/mimetypes/text-x-gettext-translation.svg
27
share/locale/af/LC_MESSAGES/poedit.mo
12
share/locale/af/LC_MESSAGES/poedit.mo
28
share/locale/am/LC_MESSAGES/poedit.mo
29
share/locale/an/LC_MESSAGES/poedit.mo
13
share/locale/an/LC_MESSAGES/poedit.mo
30
share/locale/ar/LC_MESSAGES/poedit.mo
14
share/locale/ar/LC_MESSAGES/poedit.mo
31
share/locale/ast/LC_MESSAGES/poedit.mo
32
share/locale/az/LC_MESSAGES/poedit.mo
15
share/locale/az/LC_MESSAGES/poedit.mo
33
share/locale/be/LC_MESSAGES/poedit.mo
16
share/locale/be/LC_MESSAGES/poedit.mo
34
share/locale/be@latin/LC_MESSAGES/poedit.mo
17
share/locale/be@latin/LC_MESSAGES/poedit.mo
35
share/locale/bg/LC_MESSAGES/poedit.mo
18
share/locale/bg/LC_MESSAGES/poedit.mo
36
share/locale/bn/LC_MESSAGES/poedit.mo
37
share/locale/br/LC_MESSAGES/poedit.mo
38
share/locale/bs/LC_MESSAGES/poedit.mo
19
share/locale/bs/LC_MESSAGES/poedit.mo
39
share/locale/ca/LC_MESSAGES/poedit.mo
20
share/locale/ca/LC_MESSAGES/poedit.mo
40
share/locale/ca@valencia/LC_MESSAGES/poedit.mo
41
share/locale/ckb/LC_MESSAGES/poedit.mo
21
share/locale/ckb/LC_MESSAGES/poedit.mo
42
share/locale/co/LC_MESSAGES/poedit.mo
22
share/locale/co/LC_MESSAGES/poedit.mo
43
share/locale/cs/LC_MESSAGES/poedit.mo
23
share/locale/cs/LC_MESSAGES/poedit.mo
Lines 45-84 share/locale/da/LC_MESSAGES/poedit.mo Link Here
45
share/locale/de/LC_MESSAGES/poedit.mo
25
share/locale/de/LC_MESSAGES/poedit.mo
46
share/locale/el/LC_MESSAGES/poedit.mo
26
share/locale/el/LC_MESSAGES/poedit.mo
47
share/locale/en_GB/LC_MESSAGES/poedit.mo
27
share/locale/en_GB/LC_MESSAGES/poedit.mo
48
share/locale/eo/LC_MESSAGES/poedit.mo
49
share/locale/es/LC_MESSAGES/poedit.mo
28
share/locale/es/LC_MESSAGES/poedit.mo
50
share/locale/et/LC_MESSAGES/poedit.mo
29
share/locale/et/LC_MESSAGES/poedit.mo
51
share/locale/eu/LC_MESSAGES/poedit.mo
30
share/locale/eu/LC_MESSAGES/poedit.mo
52
share/locale/fa/LC_MESSAGES/poedit.mo
31
share/locale/fa/LC_MESSAGES/poedit.mo
53
share/locale/fi/LC_MESSAGES/poedit.mo
32
share/locale/fi/LC_MESSAGES/poedit.mo
54
share/locale/fr/LC_MESSAGES/poedit.mo
33
share/locale/fr/LC_MESSAGES/poedit.mo
55
share/locale/fur/LC_MESSAGES/poedit.mo
56
share/locale/fy_NL/LC_MESSAGES/poedit.mo
57
share/locale/ga/LC_MESSAGES/poedit.mo
34
share/locale/ga/LC_MESSAGES/poedit.mo
58
share/locale/gl/LC_MESSAGES/poedit.mo
35
share/locale/gl/LC_MESSAGES/poedit.mo
59
share/locale/he/LC_MESSAGES/poedit.mo
36
share/locale/he/LC_MESSAGES/poedit.mo
60
share/locale/hi/LC_MESSAGES/poedit.mo
61
share/locale/hr/LC_MESSAGES/poedit.mo
37
share/locale/hr/LC_MESSAGES/poedit.mo
62
share/locale/hu/LC_MESSAGES/poedit.mo
38
share/locale/hu/LC_MESSAGES/poedit.mo
39
share/locale/hy/LC_MESSAGES/poedit.mo
63
share/locale/id/LC_MESSAGES/poedit.mo
40
share/locale/id/LC_MESSAGES/poedit.mo
64
share/locale/is/LC_MESSAGES/poedit.mo
41
share/locale/is/LC_MESSAGES/poedit.mo
65
share/locale/it/LC_MESSAGES/poedit.mo
42
share/locale/it/LC_MESSAGES/poedit.mo
66
share/locale/ja/LC_MESSAGES/poedit.mo
43
share/locale/ja/LC_MESSAGES/poedit.mo
67
share/locale/ka/LC_MESSAGES/poedit.mo
44
share/locale/ka/LC_MESSAGES/poedit.mo
45
share/locale/kab/LC_MESSAGES/poedit.mo
68
share/locale/kk/LC_MESSAGES/poedit.mo
46
share/locale/kk/LC_MESSAGES/poedit.mo
69
share/locale/ko/LC_MESSAGES/poedit.mo
47
share/locale/ko/LC_MESSAGES/poedit.mo
70
share/locale/ku/LC_MESSAGES/poedit.mo
71
share/locale/ky/LC_MESSAGES/poedit.mo
72
share/locale/lt/LC_MESSAGES/poedit.mo
48
share/locale/lt/LC_MESSAGES/poedit.mo
73
share/locale/lv/LC_MESSAGES/poedit.mo
49
share/locale/lv/LC_MESSAGES/poedit.mo
74
share/locale/mk/LC_MESSAGES/poedit.mo
75
share/locale/mn/LC_MESSAGES/poedit.mo
76
share/locale/mr/LC_MESSAGES/poedit.mo
77
share/locale/ms/LC_MESSAGES/poedit.mo
50
share/locale/ms/LC_MESSAGES/poedit.mo
78
share/locale/nb/LC_MESSAGES/poedit.mo
51
share/locale/nb/LC_MESSAGES/poedit.mo
79
share/locale/ne/LC_MESSAGES/poedit.mo
80
share/locale/nl/LC_MESSAGES/poedit.mo
52
share/locale/nl/LC_MESSAGES/poedit.mo
81
share/locale/nn/LC_MESSAGES/poedit.mo
82
share/locale/oc/LC_MESSAGES/poedit.mo
53
share/locale/oc/LC_MESSAGES/poedit.mo
83
share/locale/pa/LC_MESSAGES/poedit.mo
54
share/locale/pa/LC_MESSAGES/poedit.mo
84
share/locale/pl/LC_MESSAGES/poedit.mo
55
share/locale/pl/LC_MESSAGES/poedit.mo
Lines 91-127 share/locale/sl/LC_MESSAGES/poedit.mo Link Here
91
share/locale/sq/LC_MESSAGES/poedit.mo
62
share/locale/sq/LC_MESSAGES/poedit.mo
92
share/locale/sr/LC_MESSAGES/poedit.mo
63
share/locale/sr/LC_MESSAGES/poedit.mo
93
share/locale/sv/LC_MESSAGES/poedit.mo
64
share/locale/sv/LC_MESSAGES/poedit.mo
94
share/locale/ta/LC_MESSAGES/poedit.mo
95
share/locale/tg/LC_MESSAGES/poedit.mo
65
share/locale/tg/LC_MESSAGES/poedit.mo
96
share/locale/th/LC_MESSAGES/poedit.mo
66
share/locale/th/LC_MESSAGES/poedit.mo
97
share/locale/tr/LC_MESSAGES/poedit.mo
67
share/locale/tr/LC_MESSAGES/poedit.mo
98
share/locale/tt/LC_MESSAGES/poedit.mo
99
share/locale/ug/LC_MESSAGES/poedit.mo
100
share/locale/uk/LC_MESSAGES/poedit.mo
68
share/locale/uk/LC_MESSAGES/poedit.mo
101
share/locale/ur/LC_MESSAGES/poedit.mo
102
share/locale/uz/LC_MESSAGES/poedit.mo
69
share/locale/uz/LC_MESSAGES/poedit.mo
103
share/locale/vi/LC_MESSAGES/poedit.mo
70
share/locale/vi/LC_MESSAGES/poedit.mo
104
share/locale/wa/LC_MESSAGES/poedit.mo
105
share/locale/zh_CN/LC_MESSAGES/poedit.mo
71
share/locale/zh_CN/LC_MESSAGES/poedit.mo
106
share/locale/zh_TW/LC_MESSAGES/poedit.mo
72
share/locale/zh_TW/LC_MESSAGES/poedit.mo
107
share/pixmaps/poedit.png
73
share/metainfo/net.poedit.Poedit.appdata.xml
108
%%DATADIR%%/icons/CrowdinLogo.png
74
%%DATADIR%%/icons/CrowdinLogoTemplate.png
109
%%DATADIR%%/icons/PoeditWelcome.png
75
%%DATADIR%%/icons/DownvoteTemplate.png
110
%%DATADIR%%/icons/SuggestionError.png
76
%%DATADIR%%/icons/ExtractorsGNUgettext.png
111
%%DATADIR%%/icons/SuggestionTM.png
77
%%DATADIR%%/icons/ItemBookmarkTemplate.png
112
%%DATADIR%%/icons/document-new.png
78
%%DATADIR%%/icons/ItemCommentTemplate.png
79
%%DATADIR%%/icons/StatusError.png
80
%%DATADIR%%/icons/StatusErrorBlack.png
81
%%DATADIR%%/icons/StatusWarning.png
82
%%DATADIR%%/icons/StatusWarningBlack.png
83
%%DATADIR%%/icons/SuggestionErrorTemplate.png
84
%%DATADIR%%/icons/SuggestionPerfectMatch.png
85
%%DATADIR%%/icons/SuggestionTMTemplate.png
113
%%DATADIR%%/icons/document-open.png
86
%%DATADIR%%/icons/document-open.png
114
%%DATADIR%%/icons/document-properties.png
115
%%DATADIR%%/icons/document-save.png
87
%%DATADIR%%/icons/document-save.png
116
%%DATADIR%%/icons/edit-delete.png
88
%%DATADIR%%/icons/hicolor/scalable/actions/poedit-sync-symbolic.svg
117
%%DATADIR%%/icons/poedit-fuzzy.png
89
%%DATADIR%%/icons/hicolor/scalable/actions/poedit-update-symbolic.svg
118
%%DATADIR%%/icons/poedit-status-automatic.png
90
%%DATADIR%%/icons/hicolor/scalable/actions/poedit-validate-symbolic.svg
119
%%DATADIR%%/icons/poedit-status-bookmark.png
91
%%DATADIR%%/icons/hicolor/scalable/actions/sidebar-symbolic.svg
120
%%DATADIR%%/icons/poedit-status-cat-mid.png
92
%%DATADIR%%/icons/poedit-status-cat-mid.png
121
%%DATADIR%%/icons/poedit-status-cat-no.png
93
%%DATADIR%%/icons/poedit-status-cat-no.png
122
%%DATADIR%%/icons/poedit-status-cat-ok.png
94
%%DATADIR%%/icons/poedit-status-cat-ok.png
123
%%DATADIR%%/icons/poedit-status-comment.png
124
%%DATADIR%%/icons/poedit-status-nothing.png
125
%%DATADIR%%/icons/poedit-sync.png
95
%%DATADIR%%/icons/poedit-sync.png
126
%%DATADIR%%/icons/poedit-update.png
96
%%DATADIR%%/icons/poedit-update.png
127
%%DATADIR%%/icons/poedit-validate.png
97
%%DATADIR%%/icons/poedit-validate.png

Return to bug 262139