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