git.iko.soy/typeable/nixpkgs
on master help sign in
qt4: Vendor bitrotted Arch Linux patch

It is no longer found at this URL. Vendoring until a better solution comes along. Fixes #63084

commit280795c163ba70d6d0c0c0fc2e87ce4c8801dbac authorJohn Ericson <John.Ericson@Obsidian.Systems> dateThu 15 Aug 2019, 11:25 (7 years ago) parentbfc7214
2 files changed+40−5
pkgs/development/libraries/qt-4.x/4.8/default.nix+7−5 pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch+33
pkgs/development/libraries/qt-4.x/4.8/default.nix+7−5
@@ -82,11 +82,13 @@ stdenv.mkDerivation rec {
8282 + "21b342d71c19e6d68b649947f913410fe6129ea4/debian/patches/kubuntu_39_fix_medium_font.diff";
8383 sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j";
8484 })
85− (fetchpatch {
86− name = "qt4-gcc6.patch";
87− url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f";
88− sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34";
89− })
85+ # Patch is no longer available from here, so vendoring it for now.
86+ #(fetchpatch {
87+ # name = "qt4-gcc6.patch";
88+ # url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f";
89+ # sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34";
90+ #})
91+ ./qt4-gcc6.patch
9092 ]
9193 ++ lib.optional gtkStyle (substituteAll ({
9294 src = ./dlopen-gtkstyle.diff;
pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patchnew file+33
@@ -0,0 +1,33 @@
1+--- qt-everywhere-opensource-src-4.8.7/configure.gcc6 2016-04-15 07:04:19.430268222 -0500
2++++ qt-everywhere-opensource-src-4.8.7/configure 2016-04-15 07:05:22.157568689 -0500
3+@@ -7744,7 +7744,7 @@
4+ *-g++*)
5+ # Check gcc's version
6+ case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
7+- 5*|4*|3.4*)
8++ 8*|7*|6*|5*|4*|3.4*)
9+ ;;
10+ 3.3*)
11+ canBuildWebKit="no"
12+@@ -8060,7 +8060,7 @@
13+ 3.*)
14+ COMPILER_VERSION="3.*"
15+ ;;
16+- 5*|4.*)
17++ 8*|7*|6*|5*|4.*)
18+ COMPILER_VERSION="4"
19+ ;;
20+ *)
21+--- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 2015-05-07 09:14:48.000000000 -0500
22++++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h 2016-04-15 07:04:19.431268227 -0500
23+@@ -70,8 +70,8 @@
24+ ForegroundShift = 10,
25+ BackgroundShift = 20,
26+ SpecialShift = 20,
27+- ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift,
28+- BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift
29++ ForegroundMask = 0x1f << ForegroundShift,
30++ BackgroundMask = 0x7 << BackgroundShift
31+ };
32+
33+ public: