main/wxgtk2.8: fix gcc6 narrowing error

2 files changed, 85 insertions, 4 deletions

diff --git a/main/wxgtk2.8/APKBUILD b/main/wxgtk2.8/APKBUILD
index b181623db1..5856efbb1a 100644
--- a/main/wxgtk2.8/APKBUILD
+++ b/main/wxgtk2.8/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wxgtk2.8
 pkgver=2.8.12.1
-pkgrel=3
+pkgrel=4
 pkgdesc="GTK2 port of the wxWidgets GUI library"
 url="http://www.wxwidgets.org/"
 arch="all"
@@ -17,6 +17,7 @@ replaces="wxgtk"
 subpackages="$pkgname-dev $pkgname-lang $pkgname-media $pkgname-base"
 source="http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2
 	wxGTK-2.8.12-abicheck.patch
+	wxGTK-narrowing.patch
 	"
 
 _builddir="$srcdir"/wxPython-src-$pkgver
@@ -79,8 +80,11 @@ base() {
 }
 
 md5sums="8c06c5941477beee213b4f2fa78be620  wxPython-src-2.8.12.1.tar.bz2
-e71ac89e0ed2562d821cfbf1263ce4cb  wxGTK-2.8.12-abicheck.patch"
+e71ac89e0ed2562d821cfbf1263ce4cb  wxGTK-2.8.12-abicheck.patch
+e5bccf21fb5a37f8255bb626586ed6c7  wxGTK-narrowing.patch"
 sha256sums="1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0  wxPython-src-2.8.12.1.tar.bz2
-46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453  wxGTK-2.8.12-abicheck.patch"
+46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453  wxGTK-2.8.12-abicheck.patch
+42ce51e6e73a1035908cba7b0c6d4a675705d9c79a735f8be197571c8f15e23f  wxGTK-narrowing.patch"
 sha512sums="4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3  wxPython-src-2.8.12.1.tar.bz2
-5b365d9e0f1e7c9a053514010bd78b4192a4472d6ae76590f6999a4bf04d1de0fae5847fac878ab2dd581f4e0ec3959b317e5efacd3bd6628b89c5f65756cf83  wxGTK-2.8.12-abicheck.patch"
+5b365d9e0f1e7c9a053514010bd78b4192a4472d6ae76590f6999a4bf04d1de0fae5847fac878ab2dd581f4e0ec3959b317e5efacd3bd6628b89c5f65756cf83  wxGTK-2.8.12-abicheck.patch
+cd7fc58e883ff9ef185bc8deff333f7a785d8bd3e8abebef741b598436bc486f2904540be7d2c891ef070b45008f2e5f5961c7978b0a8166ef259e17b7481739  wxGTK-narrowing.patch"
diff --git a/main/wxgtk2.8/wxGTK-narrowing.patch b/main/wxgtk2.8/wxGTK-narrowing.patch
new file mode 100644
index 0000000000..dc9b143591
--- /dev/null
+++ b/main/wxgtk2.8/wxGTK-narrowing.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};