| 1 |
commit: 0ea4de07ab346251fccf610c8c7618360cd43a24 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 22 00:39:04 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 22 00:39:34 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ea4de07 |
| 7 |
|
| 8 |
app-editors/hteditor: tweak for gcc-10 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 12 |
|
| 13 |
.../hteditor/files/hteditor-2.1.0-gcc-10.patch | 36 ++++++++++++++++++++++ |
| 14 |
app-editors/hteditor/hteditor-2.1.0-r1.ebuild | 3 +- |
| 15 |
2 files changed, 38 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/app-editors/hteditor/files/hteditor-2.1.0-gcc-10.patch b/app-editors/hteditor/files/hteditor-2.1.0-gcc-10.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..3516efd2871 |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-editors/hteditor/files/hteditor-2.1.0-gcc-10.patch |
| 22 |
@@ -0,0 +1,36 @@ |
| 23 |
+Backport a subset of upstream c++11 fixes. |
| 24 |
+--- a/htmacho.cc |
| 25 |
++++ b/htmacho.cc |
| 26 |
+@@ -146,7 +146,7 @@ void ht_macho::init(Bounds *b, File *f, format_viewer_if **ifs, ht_format_group |
| 27 |
+ break; |
| 28 |
+ case MACHO_CPU_TYPE_I386: |
| 29 |
+ switch (c->flavor) { |
| 30 |
+- case -1: |
| 31 |
++ default: |
| 32 |
+ createHostStruct(&c->state, MACHO_I386_THREAD_STATE_struct, image_endianess); |
| 33 |
+ break; |
| 34 |
+ } |
| 35 |
+--- a/htmachohd.cc |
| 36 |
++++ b/htmachohd.cc |
| 37 |
+@@ -313,7 +313,7 @@ static ht_view *htmachoheader_init(Bounds *b, File *file, ht_format_group *group |
| 38 |
+ switch (macho_shared->header.cputype) { |
| 39 |
+ case MACHO_CPU_TYPE_I386: |
| 40 |
+ switch (c->flavor) { |
| 41 |
+- case -1: |
| 42 |
++ default: |
| 43 |
+ m->add_staticmask_ptable(macho_i386_thread_state, ofs+4*4/*4 32bit words in thread_header*/, isbigendian); |
| 44 |
+ break; |
| 45 |
+ } |
| 46 |
+--- a/io/types.h |
| 47 |
++++ b/io/types.h |
| 48 |
+@@ -87,8 +87,8 @@ union htmsg_param { |
| 49 |
+ }; |
| 50 |
+ |
| 51 |
+ struct htmsg { |
| 52 |
+- int msg; |
| 53 |
+- int type; |
| 54 |
++ unsigned int msg; |
| 55 |
++ unsigned int type; |
| 56 |
+ htmsg_param data1; |
| 57 |
+ htmsg_param data2; |
| 58 |
+ }; |
| 59 |
|
| 60 |
diff --git a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild |
| 61 |
index 8798cd47595..5b468939e1f 100644 |
| 62 |
--- a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild |
| 63 |
+++ b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild |
| 64 |
@@ -1,4 +1,4 @@ |
| 65 |
-# Copyright 1999-2018 Gentoo Foundation |
| 66 |
+# Copyright 1999-2020 Gentoo Authors |
| 67 |
# Distributed under the terms of the GNU General Public License v2 |
| 68 |
|
| 69 |
EAPI=6 |
| 70 |
@@ -32,6 +32,7 @@ PATCHES=( |
| 71 |
"${FILESDIR}"/${P}-tinfo.patch |
| 72 |
"${FILESDIR}"/${P}-gcc-6-uchar.patch |
| 73 |
"${FILESDIR}"/${P}-format-security.patch |
| 74 |
+ "${FILESDIR}"/${P}-gcc-10.patch |
| 75 |
) |
| 76 |
|
| 77 |
src_prepare() { |
Archives