Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/wxgtk/patches/wxgtk-2.8.12.1-fix-c++14.patch

    Contents of /trunk/wxgtk/patches/wxgtk-2.8.12.1-fix-c++14.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2939 - (show annotations) (download)
    Tue May 30 12:46:53 2017 UTC (6 years, 11 months ago) by niro
    File size: 4518 byte(s) 
    -fix ftbfs
    1 Fix building with C++14, which errors out due to narrowing conversions.
    2 See also: https://bugs.gentoo.org/show_bug.cgi?id=592442
    3
    4 Patch by Francesco Turco
    5
    6 --- a/src/gtk/bdiag.xbm
    7 +++ b/src/gtk/bdiag.xbm
    8 @@ -1,6 +1,6 @@
    9 #define bdiag_width 16
    10 #define bdiag_height 16
    11 static char bdiag_bits[] = {
    12 - 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04,
    13 - 0x02, 0x02, 0x01, 0x01, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10,
    14 - 0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01};
    15 + (char)0x80, (char)0x80, (char)0x40, (char)0x40, (char)0x20, (char)0x20, (char)0x10, (char)0x10, (char)0x08, (char)0x08, (char)0x04, (char)0x04,
    16 + (char)0x02, (char)0x02, (char)0x01, (char)0x01, (char)0x80, (char)0x80, (char)0x40, (char)0x40, (char)0x20, (char)0x20, (char)0x10, (char)0x10,
    17 + (char)0x08, (char)0x08, (char)0x04, (char)0x04, (char)0x02, (char)0x02, (char)0x01, (char)0x01};
    18 --- a/src/gtk/cdiag.xbm
    19 +++ b/src/gtk/cdiag.xbm
    20 @@ -1,6 +1,6 @@
    21 #define cdiag_width 16
    22 #define cdiag_height 16
    23 static char cdiag_bits[] = {
    24 - 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x18, 0x18, 0x24, 0x24,
    25 - 0x42, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18,
    26 - 0x18, 0x18, 0x24, 0x24, 0x42, 0x42, 0x81, 0x81};
    27 + (char)0x81, (char)0x81, (char)0x42, (char)0x42, (char)0x24, (char)0x24, (char)0x18, (char)0x18, (char)0x18, (char)0x18, (char)0x24, (char)0x24,
    28 + (char)0x42, (char)0x42, (char)0x81, (char)0x81, (char)0x81, (char)0x81, (char)0x42, (char)0x42, (char)0x24, (char)0x24, (char)0x18, (char)0x18,
    29 + (char)0x18, (char)0x18, (char)0x24, (char)0x24, (char)0x42, (char)0x42, (char)0x81, (char)0x81};
    30 --- a/src/gtk/cross.xbm
    31 +++ b/src/gtk/cross.xbm
    32 @@ -1,6 +1,6 @@
    33 #define cross_width 15
    34 #define cross_height 15
    35 static char cross_bits[] = {
    36 - 0x84, 0x10, 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
    37 - 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
    38 - 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10};
    39 + (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
    40 + (char)0x84, (char)0x10, (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
    41 + (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10};
    42 --- a/src/gtk/fdiag.xbm
    43 +++ b/src/gtk/fdiag.xbm
    44 @@ -1,6 +1,6 @@
    45 #define fdiag_width 16
    46 #define fdiag_height 16
    47 static char fdiag_bits[] = {
    48 - 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20,
    49 - 0x40, 0x40, 0x80, 0x80, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08,
    50 - 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80};
    51 + (char)0x01, (char)0x01, (char)0x02, (char)0x02, (char)0x04, (char)0x04, (char)0x08, (char)0x08, (char)0x10, (char)0x10, (char)0x20, (char)0x20,
    52 + (char)0x40, (char)0x40, (char)0x80, (char)0x80, (char)0x01, (char)0x01, (char)0x02, (char)0x02, (char)0x04, (char)0x04, (char)0x08, (char)0x08,
    53 + (char)0x10, (char)0x10, (char)0x20, (char)0x20, (char)0x40, (char)0x40, (char)0x80, (char)0x80};
    54 --- a/src/gtk/horiz.xbm
    55 +++ b/src/gtk/horiz.xbm
    56 @@ -1,6 +1,6 @@
    57 #define horiz_width 15
    58 #define horiz_height 15
    59 static char horiz_bits[] = {
    60 - 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    61 - 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    62 - 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00};
    63 + (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00,
    64 + (char)0x00, (char)0x00, (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00,
    65 + (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00};
    66 --- a/src/gtk/verti.xbm
    67 +++ b/src/gtk/verti.xbm
    68 @@ -1,6 +1,6 @@
    69 #define verti_width 15
    70 #define verti_height 15
    71 static char verti_bits[] = {
    72 - 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
    73 - 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
    74 - 0x84, 0x10, 0x84, 0x10, 0x84, 0x10};
    75 + (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
    76 + (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
    77 + (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10};