Hello community, here is the log from the commit of package wxWidgets for openSUSE:Factory checked in at 2016-06-25 02:21:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wxWidgets (Old) and /work/SRC/openSUSE:Factory/.wxWidgets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wxWidgets" Changes: -------- --- /work/SRC/openSUSE:Factory/wxWidgets/wxWidgets-ansi.changes 2014-08-14 14:57:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wxWidgets.new/wxWidgets-ansi.changes 2016-06-25 02:22:17.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Jun 18 18:04:53 UTC 2016 - [email protected] + +- add patch: wxWidgets-2.8.12-gcc6.patch + * fix FTBFS: gcc6 narrowing conversion from int to char inside {} + * original patch from <[email protected]> for fedora project + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/wxWidgets/wxWidgets-wxcontainer.changes 2014-08-14 14:57:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wxWidgets.new/wxWidgets-wxcontainer.changes 2016-06-25 02:22:17.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Jun 18 18:05:08 UTC 2016 - [email protected] + +- add patch: wxWidgets-2.8.12-gcc6.patch + * fix FTBFS: gcc6 narrowing conversion from int to char inside {} + * original patch from <[email protected]> for fedora project + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/wxWidgets/wxWidgets-wxcontainer24c.changes 2014-08-14 14:57:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wxWidgets.new/wxWidgets-wxcontainer24c.changes 2016-06-25 02:22:18.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Jun 18 18:05:23 UTC 2016 - [email protected] + +- add patch: wxWidgets-2.8.12-gcc6.patch + * fix FTBFS: gcc6 narrowing conversion from int to char inside {} + * original patch from <[email protected]> for fedora project + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/wxWidgets/wxWidgets.changes 2014-08-14 14:57:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wxWidgets.new/wxWidgets.changes 2016-06-25 02:22:19.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Jun 18 18:03:04 UTC 2016 - [email protected] + +- add patch: wxWidgets-2.8.12-gcc6.patch + * fix FTBFS: gcc6 narrowing conversion from int to char inside {} + * original patch from <[email protected]> for fedora project + +------------------------------------------------------------------- New: ---- wxWidgets-2.8.12-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxWidgets-ansi.spec ++++++ --- /var/tmp/diff_new_pack.DilCp2/_old 2016-06-25 02:22:21.000000000 +0200 +++ /var/tmp/diff_new_pack.DilCp2/_new 2016-06-25 02:22:21.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package wxWidgets-ansi # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -116,6 +116,8 @@ Patch4: wxWidgets-find-wx-provides-bash3.patch # PATCH-FIX-UPSTREAM wxWidgets-to-wxpython-2.8.12.1.patch [email protected] -- wxPython changes backport. Patch5: wxWidgets-to-wxpython-2.8.12.1.patch +# PATCH-FIX-UPSTREAM <[email protected]> FTBFS gcc6: narrowing conversion from int to char inside {} +Patch6: wxWidgets-2.8.12-gcc6.patch Source50: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel @@ -765,6 +767,7 @@ %patch4 %endif %patch5 -p1 +%patch6 -p1 chmod +x find-wx-provides find-wx-requires %if %ENABLE_STL # Remove sources of deprecated libraries that don't compile with STL. wxWidgets-wxcontainer.spec: same change wxWidgets-wxcontainer24c.spec: same change ++++++ wxWidgets.spec ++++++ --- /var/tmp/diff_new_pack.DilCp2/_old 2016-06-25 02:22:21.000000000 +0200 +++ /var/tmp/diff_new_pack.DilCp2/_new 2016-06-25 02:22:21.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package wxWidgets # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -116,6 +116,8 @@ Patch4: wxWidgets-find-wx-provides-bash3.patch # PATCH-FIX-UPSTREAM wxWidgets-to-wxpython-2.8.12.1.patch [email protected] -- wxPython changes backport. Patch5: wxWidgets-to-wxpython-2.8.12.1.patch +# PATCH-FIX-UPSTREAM <[email protected]> FTBFS gcc6: narrowing conversion from int to char inside {} +Patch6: wxWidgets-2.8.12-gcc6.patch Source50: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel @@ -765,6 +767,7 @@ %patch4 %endif %patch5 -p1 +%patch6 -p1 chmod +x find-wx-provides find-wx-requires %if %ENABLE_STL # Remove sources of deprecated libraries that don't compile with STL. ++++++ wxWidgets-2.8.12-gcc6.patch ++++++ Index: b/src/gtk/bdiag.xbm =================================================================== --- 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[] = { +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}; Index: b/src/gtk/cdiag.xbm =================================================================== --- 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[] = { +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}; Index: b/src/gtk/cross.xbm =================================================================== --- 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[] = { +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}; Index: b/src/gtk/dcclient.cpp =================================================================== --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -427,13 +427,23 @@ 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 } } Index: b/src/gtk/fdiag.xbm =================================================================== --- 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[] = { +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}; Index: b/src/gtk/horiz.xbm =================================================================== --- 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[] = { +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}; Index: b/src/gtk/verti.xbm =================================================================== --- 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[] = { +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};
