diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-08-15 11:25:48 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-08-15 11:25:48 -0400 |
| commit | 280795c163ba70d6d0c0c0fc2e87ce4c8801dbac (patch) | |
| tree | 416eb83e55c450fd7a319d7a8526d091ffe850d0 /pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch | |
| parent | bfc72142e0b05ce103988baf4d8cff602c132a4d (diff) | |
| download | nixpkgs-280795c163ba70d6d0c0c0fc2e87ce4c8801dbac.tar nixpkgs-280795c163ba70d6d0c0c0fc2e87ce4c8801dbac.tar.gz nixpkgs-280795c163ba70d6d0c0c0fc2e87ce4c8801dbac.tar.bz2 nixpkgs-280795c163ba70d6d0c0c0fc2e87ce4c8801dbac.tar.lz nixpkgs-280795c163ba70d6d0c0c0fc2e87ce4c8801dbac.tar.xz nixpkgs-280795c163ba70d6d0c0c0fc2e87ce4c8801dbac.tar.zst nixpkgs-280795c163ba70d6d0c0c0fc2e87ce4c8801dbac.zip | |
qt4: Vendor bitrotted Arch Linux patch
It is no longer found at this URL. Vendoring until a better solution comes along. Fixes #63084
Diffstat (limited to 'pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch')
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch b/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch new file mode 100644 index 00000000000..000e345cf13 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch @@ -0,0 +1,33 @@ +--- qt-everywhere-opensource-src-4.8.7/configure.gcc6 2016-04-15 07:04:19.430268222 -0500 ++++ qt-everywhere-opensource-src-4.8.7/configure 2016-04-15 07:05:22.157568689 -0500 +@@ -7744,7 +7744,7 @@ + *-g++*) + # Check gcc's version + case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in +- 5*|4*|3.4*) ++ 8*|7*|6*|5*|4*|3.4*) + ;; + 3.3*) + canBuildWebKit="no" +@@ -8060,7 +8060,7 @@ + 3.*) + COMPILER_VERSION="3.*" + ;; +- 5*|4.*) ++ 8*|7*|6*|5*|4.*) + COMPILER_VERSION="4" + ;; + *) +--- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 2015-05-07 09:14:48.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h 2016-04-15 07:04:19.431268227 -0500 +@@ -70,8 +70,8 @@ + ForegroundShift = 10, + BackgroundShift = 20, + SpecialShift = 20, +- ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift, +- BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift ++ ForegroundMask = 0x1f << ForegroundShift, ++ BackgroundMask = 0x7 << BackgroundShift + }; + + public: |