diff --git a/wxGTK-2.8.12-char.patch b/wxGTK-2.8.12-char.patch
new file mode 100644
index 0000000..1d39a7b
--- /dev/null
+++ b/wxGTK-2.8.12-char.patch
@@ -0,0 +1,100 @@
+diff -up wxGTK-2.8.12/src/gtk/bdiag.xbm.char wxGTK-2.8.12/src/gtk/bdiag.xbm
+--- wxGTK-2.8.12/src/gtk/bdiag.xbm.char 2011-03-22 13:19:01.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/bdiag.xbm 2016-02-20 10:38:50.000000000 +0100
+@@ -1,6 +1,6 @@
+ #define bdiag_width 16
+ #define bdiag_height 16
+-static char bdiag_bits[] = {
++static unsigned 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};
+diff -up wxGTK-2.8.12/src/gtk/cdiag.xbm.char wxGTK-2.8.12/src/gtk/cdiag.xbm
+--- wxGTK-2.8.12/src/gtk/cdiag.xbm.char 2011-03-22 13:19:01.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/cdiag.xbm 2016-02-20 10:38:50.000000000 +0100
+@@ -1,6 +1,6 @@
+ #define cdiag_width 16
+ #define cdiag_height 16
+-static char cdiag_bits[] = {
++static unsigned 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};
+diff -up wxGTK-2.8.12/src/gtk/cross.xbm.char wxGTK-2.8.12/src/gtk/cross.xbm
+--- wxGTK-2.8.12/src/gtk/cross.xbm.char 2011-03-22 13:19:01.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/cross.xbm 2016-02-20 10:38:50.000000000 +0100
+@@ -1,6 +1,6 @@
+ #define cross_width 15
+ #define cross_height 15
+-static char cross_bits[] = {
++static unsigned 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};
+diff -up wxGTK-2.8.12/src/gtk/dcclient.cpp.char wxGTK-2.8.12/src/gtk/dcclient.cpp
+--- wxGTK-2.8.12/src/gtk/dcclient.cpp.char 2016-02-20 10:38:50.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/dcclient.cpp 2016-02-20 10:49:11.000000000 +0100
+@@ -427,13 +427,24 @@ void wxWindowDC::SetUpDC()
+
+ if (!hatch_bitmap)
+ {
++#define CREATE_FROM_XBM_DATA(name) \
++ gdk_bitmap_create_from_data \
++ ( \
++ NULL, \
++ reinterpret_cast<gchar *>(name ## _bits), \
++ name ## _width, \
++ name ## _height \
++ )
++
+ hatch_bitmap = hatches;
+- hatch_bitmap[0] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, bdiag_bits, bdiag_width, bdiag_height );
+- hatch_bitmap[1] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, cdiag_bits, cdiag_width, cdiag_height );
+- hatch_bitmap[2] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, fdiag_bits, fdiag_width, fdiag_height );
+- hatch_bitmap[3] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, cross_bits, cross_width, cross_height );
+- hatch_bitmap[4] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, horiz_bits, horiz_width, horiz_height );
+- hatch_bitmap[5] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, verti_bits, verti_width, verti_height );
++ hatch_bitmap[0] = CREATE_FROM_XBM_DATA(bdiag);
++ hatch_bitmap[1] = CREATE_FROM_XBM_DATA(cdiag);
++ hatch_bitmap[2] = CREATE_FROM_XBM_DATA(fdiag);
++ hatch_bitmap[3] = CREATE_FROM_XBM_DATA(cross);
++ hatch_bitmap[4] = CREATE_FROM_XBM_DATA(horiz);
++ hatch_bitmap[5] = CREATE_FROM_XBM_DATA(verti);
++
++#undef CREATE_FROM_XBM_DATA
+ }
+ }
+
+diff -up wxGTK-2.8.12/src/gtk/fdiag.xbm.char wxGTK-2.8.12/src/gtk/fdiag.xbm
+--- wxGTK-2.8.12/src/gtk/fdiag.xbm.char 2011-03-22 13:19:01.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/fdiag.xbm 2016-02-20 10:38:50.000000000 +0100
+@@ -1,6 +1,6 @@
+ #define fdiag_width 16
+ #define fdiag_height 16
+-static char fdiag_bits[] = {
++static unsigned 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};
+diff -up wxGTK-2.8.12/src/gtk/horiz.xbm.char wxGTK-2.8.12/src/gtk/horiz.xbm
+--- wxGTK-2.8.12/src/gtk/horiz.xbm.char 2011-03-22 13:19:01.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/horiz.xbm 2016-02-20 10:38:50.000000000 +0100
+@@ -1,6 +1,6 @@
+ #define horiz_width 15
+ #define horiz_height 15
+-static char horiz_bits[] = {
++static unsigned 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};
+diff -up wxGTK-2.8.12/src/gtk/verti.xbm.char wxGTK-2.8.12/src/gtk/verti.xbm
+--- wxGTK-2.8.12/src/gtk/verti.xbm.char 2011-03-22 13:19:02.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/verti.xbm 2016-02-20 10:38:50.000000000 +0100
+@@ -1,6 +1,6 @@
+ #define verti_width 15
+ #define verti_height 15
+-static char verti_bits[] = {
++static unsigned 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};
diff --git a/wxGTK.spec b/wxGTK.spec
index 8204c54..f33d030 100644
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -1,6 +1,6 @@
Name: wxGTK
Version: 2.8.12
-Release: 22%{?dist}
+Release: 23%{?dist}
Summary: GTK2 port of the wxWidgets GUI library
License: wxWidgets
Group: System Environment/Libraries
@@ -11,6 +11,9 @@ Patch0: %{name}-2.8.12-test.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1200611
# remove abort when ABI check fails
Patch1: %{name}-2.8.12-abicheck.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1308243
+# backported from https://github.com/wxWidgets/wxWidgets/commit/1780a38b7bc9a9c04d33775a3176fe8516465f50
+Patch2: %{name}-2.8.12-char.patch
BuildRequires: gtk2-devel, zlib-devel >= 1.1.4
BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel
@@ -20,7 +23,7 @@ BuildRequires: libSM-devel
BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10
BuildRequires: GConf2-devel
BuildRequires: autoconf, gettext
-BuildRequires: cppunit-devel
+#BuildRequires: cppunit-devel
Requires: wxBase = %{version}-%{release}
Provides: bundled(scintilla) = 1.70
@@ -81,6 +84,7 @@ libraries or the X Window System.
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .test
%patch1 -p1 -b .abicheck
+%patch2 -p1 -b .char
sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
@@ -151,7 +155,7 @@ cat wxmsw.lang >> wxstd.lang
%check
pushd tests
-make test
+#make test
popd
@@ -212,6 +216,10 @@ popd
%changelog
+* Sat Feb 20 2016 Dan Horák <dan[at]danny.cz> - 2.8.12-23
+- fix FTBFS (#1308243)
+- skip tests as they depend on cppunit-config which was removed from cppunit-devel
+
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.12-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild