Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/files/
Date: Mon, 30 Oct 2017 21:32:04
Message-Id: 1509398777.8041b1831b5b858344b513ab4d0863f911a48c28.monsieurp@gentoo
1 commit: 8041b1831b5b858344b513ab4d0863f911a48c28
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Oct 1 13:35:14 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 30 21:26:17 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8041b183
7
8 media-video/subtitleeditor: remove unused patch.
9
10 Closes: https://github.com/gentoo/gentoo/pull/5828
11
12 .../files/subtitleeditor-0.52.1-build-fix.patch | 55 ----------------------
13 1 file changed, 55 deletions(-)
14
15 diff --git a/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch b/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch
16 deleted file mode 100644
17 index 9cce5d2d98f..00000000000
18 --- a/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch
19 +++ /dev/null
20 @@ -1,55 +0,0 @@
21 -Fix build errors with gcc-4.9.3 -std=c++11 (after disabling -ansi)
22 -
23 -https://gna.org/bugs/?23714
24 -
25 -https://bugs.gentoo.org/show_bug.cgi?id=550764
26 -https://bugs.gentoo.org/show_bug.cgi?id=566328
27 -
28 ---- a/src/subtitleview.cc 2015-12-24 01:52:29.322622155 +0100
29 -+++ b/src/subtitleview.cc 2015-12-24 01:52:44.210491213 +0100
30 -@@ -1363,7 +1363,7 @@
31 - {
32 - int num;
33 - std::istringstream ss(event->string);
34 -- bool is_num = ss >> num != 0;
35 -+ bool is_num = static_cast<bool>(ss >> num) != 0;
36 - // Update only if it's different
37 - if(is_num != get_enable_search())
38 - set_enable_search(is_num);
39 ---- a/src/utility.h 2015-12-24 01:49:42.205104858 +0100
40 -+++ b/src/utility.h 2015-12-24 01:50:23.387737071 +0100
41 -@@ -91,7 +91,7 @@
42 - std::istringstream s(src);
43 - // return s >> dest != 0;
44 -
45 -- bool state = s >> dest != 0;
46 -+ bool state = static_cast<bool>(s >> dest) != 0;
47 -
48 - if(!state)
49 - se_debug_message(SE_DEBUG_UTILITY, "string:'%s'failed.", src.c_str());
50 ---- a/plugins/actions/dialoguize/dialoguize.cc 2015-12-24 01:06:24.125428454 +0100
51 -+++ b/plugins/actions/dialoguize/dialoguize.cc 2015-12-24 01:06:42.630277006 +0100
52 -@@ -23,7 +23,7 @@
53 - * along with this program. If not, see <http://www.gnu.org/licenses/>.
54 - */
55 -
56 --#include <auto_ptr.h>
57 -+#include <memory>
58 - #include "extension/action.h"
59 - #include "i18n.h"
60 - #include "debug.h"
61 ---- a/plugins/actions/documentmanagement/documentmanagement.old 2015-12-24 01:17:13.914730337 +0100
62 -+++ b/plugins/actions/documentmanagement/documentmanagement.cc 2015-12-24 01:17:23.339640430 +0100
63 -@@ -178,9 +178,9 @@
64 -
65 - ui_id = ui->new_merge_id();
66 -
67 -- #define ADD_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/"name, name, name);
68 -- #define ADD_OPEN_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-open/"name, name, name);
69 -- #define ADD_SAVE_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-save/"name, name, name);
70 -+ #define ADD_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/" name, name, name);
71 -+ #define ADD_OPEN_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-open/" name, name, name);
72 -+ #define ADD_SAVE_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-save/" name, name, name);
73 -
74 - ADD_UI("new-document");
75 - ADD_OPEN_UI("open-document");