diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-08-15 11:34:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-15 11:34:57 -0400 |
| commit | 3532a6452eab504e2f71c847c5b00cfd7ea2bc65 (patch) | |
| tree | b68423ad9f90e98f046859fe6cc9e2e5479adfdf /pkgs/development/libraries/qt-4.x | |
| parent | ae15177adec5c01cb707ecd0d3f998e8fa556404 (diff) | |
| parent | 280795c163ba70d6d0c0c0fc2e87ce4c8801dbac (diff) | |
| download | nixpkgs-3532a6452eab504e2f71c847c5b00cfd7ea2bc65.tar nixpkgs-3532a6452eab504e2f71c847c5b00cfd7ea2bc65.tar.gz nixpkgs-3532a6452eab504e2f71c847c5b00cfd7ea2bc65.tar.bz2 nixpkgs-3532a6452eab504e2f71c847c5b00cfd7ea2bc65.tar.lz nixpkgs-3532a6452eab504e2f71c847c5b00cfd7ea2bc65.tar.xz nixpkgs-3532a6452eab504e2f71c847c5b00cfd7ea2bc65.tar.zst nixpkgs-3532a6452eab504e2f71c847c5b00cfd7ea2bc65.zip | |
Merge pull request #66683 from obsidiansystems/missing-qt-patch
qt4: Vendor bitrotted Arch Linux patch
Diffstat (limited to 'pkgs/development/libraries/qt-4.x')
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch | 33 |
2 files changed, 40 insertions, 5 deletions
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index de6457db98b..f833d130fbb 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -83,11 +83,13 @@ stdenv.mkDerivation rec { + "21b342d71c19e6d68b649947f913410fe6129ea4/debian/patches/kubuntu_39_fix_medium_font.diff"; sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j"; }) - (fetchpatch { - name = "qt4-gcc6.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f"; - sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34"; - }) + # Patch is no longer available from here, so vendoring it for now. + #(fetchpatch { + # name = "qt4-gcc6.patch"; + # url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f"; + # sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34"; + #}) + ./qt4-gcc6.patch ] ++ lib.optional gtkStyle (substituteAll ({ src = ./dlopen-gtkstyle.diff; 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: |