Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/qt4/patches/qt-4.8.7-gcc6.patch

    Annotation of /trunk/qt4/patches/qt-4.8.7-gcc6.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2917 - (hide annotations) (download)
    Wed May 17 09:04:25 2017 UTC (7 years ago) by niro
    File size: 1513 byte(s) 
    -fixed patches
    1 niro 2917 diff -up qt-everywhere-opensource-src-4.8.7/configure.gcc6 qt-everywhere-opensource-src-4.8.7/configure
    2     --- qt-everywhere-opensource-src-4.8.7/configure.gcc6 2016-04-15 07:04:19.430268222 -0500
    3     +++ qt-everywhere-opensource-src-4.8.7/configure 2016-04-15 07:05:22.157568689 -0500
    4     @@ -7744,7 +7744,7 @@ case "$XPLATFORM" in
    5 niro 2911 *-g++*)
    6 niro 2917 # Check gcc's version
    7     case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
    8     - 5*|4*|3.4*)
    9     + 8*|7*|6*|5*|4*|3.4*)
    10 niro 2911 ;;
    11     3.3*)
    12 niro 2917 canBuildWebKit="no"
    13     @@ -8060,7 +8060,7 @@ g++*)
    14 niro 2911 3.*)
    15 niro 2917 COMPILER_VERSION="3.*"
    16 niro 2911 ;;
    17 niro 2917 - 5*|4.*)
    18     + 8*|7*|6*|5*|4.*)
    19     COMPILER_VERSION="4"
    20 niro 2911 ;;
    21     *)
    22     diff -up qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6
    23     qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h
    24 niro 2917 --- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 2015-05-07 09:14:48.000000000 -0500
    25     +++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h 2016-04-15 07:04:19.431268227 -0500
    26     @@ -70,8 +70,8 @@ namespace QPatternist
    27 niro 2911 ForegroundShift = 10,
    28     BackgroundShift = 20,
    29     SpecialShift = 20,
    30 niro 2917 - ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift,
    31     - BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift
    32     + ForegroundMask = 0x1f << ForegroundShift,
    33     + BackgroundMask = 0x7 << BackgroundShift
    34 niro 2911 };
    35    
    36     public: