commit:     b98cf3b8e69fc19e26600992a236e99d175da5dc
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 21:48:11 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 22:25:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b98cf3b8

x11-libs/wxGTK: Allow for compiling with GCC 6

Gentoo-bug: 592442
* Patch by Francesco Turco

Package-Manager: portage-2.3.0

 .../wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch     | 77 ++++++++++++++++++++++
 x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild            |  1 +
 2 files changed, 78 insertions(+)

diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch 
b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch
new file mode 100644
index 00000000..dc9b143
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-fix-c++14.patch
@@ -0,0 +1,77 @@
+Fix building with C++14, which errors out due to narrowing conversions.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=592442
+
+Patch by Francesco Turco
+
+--- a/src/gtk/bdiag.xbm
++++ b/src/gtk/bdiag.xbm
+@@ -1,6 +1,6 @@
+ #define bdiag_width 16
+ #define bdiag_height 16
+ static char bdiag_bits[] = {
+-   0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04,
+-   0x02, 0x02, 0x01, 0x01, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10,
+-   0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01};
++   (char)0x80, (char)0x80, (char)0x40, (char)0x40, (char)0x20, (char)0x20, 
(char)0x10, (char)0x10, (char)0x08, (char)0x08, (char)0x04, (char)0x04,
++   (char)0x02, (char)0x02, (char)0x01, (char)0x01, (char)0x80, (char)0x80, 
(char)0x40, (char)0x40, (char)0x20, (char)0x20, (char)0x10, (char)0x10,
++   (char)0x08, (char)0x08, (char)0x04, (char)0x04, (char)0x02, (char)0x02, 
(char)0x01, (char)0x01};
+--- a/src/gtk/cdiag.xbm
++++ b/src/gtk/cdiag.xbm
+@@ -1,6 +1,6 @@
+ #define cdiag_width 16
+ #define cdiag_height 16
+ static char cdiag_bits[] = {
+-   0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x18, 0x18, 0x24, 0x24,
+-   0x42, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18,
+-   0x18, 0x18, 0x24, 0x24, 0x42, 0x42, 0x81, 0x81};
++   (char)0x81, (char)0x81, (char)0x42, (char)0x42, (char)0x24, (char)0x24, 
(char)0x18, (char)0x18, (char)0x18, (char)0x18, (char)0x24, (char)0x24,
++   (char)0x42, (char)0x42, (char)0x81, (char)0x81, (char)0x81, (char)0x81, 
(char)0x42, (char)0x42, (char)0x24, (char)0x24, (char)0x18, (char)0x18,
++   (char)0x18, (char)0x18, (char)0x24, (char)0x24, (char)0x42, (char)0x42, 
(char)0x81, (char)0x81};
+--- a/src/gtk/cross.xbm
++++ b/src/gtk/cross.xbm
+@@ -1,6 +1,6 @@
+ #define cross_width 15
+ #define cross_height 15
+ static char cross_bits[] = {
+-   0x84, 0x10, 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+-   0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+-   0xff, 0x7f, 0x84, 0x10, 0x84, 0x10};
++   (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0xff, (char)0x7f, 
(char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
++   (char)0x84, (char)0x10, (char)0xff, (char)0x7f, (char)0x84, (char)0x10, 
(char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
++   (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10};
+--- a/src/gtk/fdiag.xbm
++++ b/src/gtk/fdiag.xbm
+@@ -1,6 +1,6 @@
+ #define fdiag_width 16
+ #define fdiag_height 16
+ static char fdiag_bits[] = {
+-   0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20,
+-   0x40, 0x40, 0x80, 0x80, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08,
+-   0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80};
++   (char)0x01, (char)0x01, (char)0x02, (char)0x02, (char)0x04, (char)0x04, 
(char)0x08, (char)0x08, (char)0x10, (char)0x10, (char)0x20, (char)0x20,
++   (char)0x40, (char)0x40, (char)0x80, (char)0x80, (char)0x01, (char)0x01, 
(char)0x02, (char)0x02, (char)0x04, (char)0x04, (char)0x08, (char)0x08,
++   (char)0x10, (char)0x10, (char)0x20, (char)0x20, (char)0x40, (char)0x40, 
(char)0x80, (char)0x80};
+--- a/src/gtk/horiz.xbm
++++ b/src/gtk/horiz.xbm
+@@ -1,6 +1,6 @@
+ #define horiz_width 15
+ #define horiz_height 15
+ static char horiz_bits[] = {
+-   0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0xff, 0x7f, 0x00, 0x00, 0x00, 0x00};
++   (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0xff, (char)0x7f, 
(char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00,
++   (char)0x00, (char)0x00, (char)0xff, (char)0x7f, (char)0x00, (char)0x00, 
(char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00,
++   (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00};
+--- a/src/gtk/verti.xbm
++++ b/src/gtk/verti.xbm
+@@ -1,6 +1,6 @@
+ #define verti_width 15
+ #define verti_height 15
+ static char verti_bits[] = {
+-   0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+-   0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+-   0x84, 0x10, 0x84, 0x10, 0x84, 0x10};
++   (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, 
(char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
++   (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, 
(char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
++   (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10};

diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild 
b/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild
index 8b71f20..6c48d4c 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild
@@ -73,6 +73,7 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch
        epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
        epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch     # Bug #310923
+       epatch "${FILESDIR}"/${PN}-2.8.12.1-fix-c++14.patch        # Bug #592442
 
        # Bug #421851
        epatch "${FILESDIR}"/${P}-libdir.patch

Reply via email to