Unverified Commit 53ad6fd1 authored by Nick Cao's avatar Nick Cao
Browse files

qt6.qtbase: refresh patches

parent 3e46f20a

pkgs/development/libraries/qt-6/default.nix

+8 −8
Original line number Diff line number Diff line
@@ -51,14 +51,14 @@ let 
          ./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch

          ./patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch

          ./patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch

          ./patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch

          ./patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch

          ./patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch

          ./patches/0007-qtbase-find-tools-in-PATH.patch

          ./patches/0008-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch

          ./patches/0009-qtbase-allow-translations-outside-prefix.patch

          ./patches/0010-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch

          ./patches/0011-qtbase-check-in-the-QML-folder-of-this-library-does-.patch

          ./patches/0004-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch

          ./patches/0005-qtbase-qt-cmake-always-use-cmake-from-path.patch

          ./patches/0006-qtbase-find-tools-in-PATH.patch

          ./patches/0007-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch

          ./patches/0008-qtbase-allow-translations-outside-prefix.patch

          ./patches/0009-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch

          ./patches/0010-qtbase-check-in-the-QML-folder-of-this-library-does-.patch

          ./patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch

        ];

      };

      env = callPackage ./qt-env.nix { };

pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch

+1 −1
Original line number Diff line number Diff line 
From afbe4002948e60ee3b27cb9be9e549ae416373f8 Mon Sep 17 00:00:00 2001

From 90734859d2f9e6b9a1754c3e694ceb1a3c870bce Mon Sep 17 00:00:00 2001

From: Nick Cao <nickcao@nichi.co>

Date: Thu, 13 Apr 2023 23:42:29 +0800

Subject: [PATCH 01/11] qtbase: qmake: always use libname instead of absolute

pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch

+1 −1
Original line number Diff line number Diff line 
From 8d3f5ee63ed29fe41927b904aa1e2b40f90c8ef4 Mon Sep 17 00:00:00 2001

From a804a9b1efdab0a71b9947e5c2bf9f6f5e316e0e Mon Sep 17 00:00:00 2001

From: Nick Cao <nickcao@nichi.co>

Date: Fri, 14 Apr 2023 21:43:04 +0800

Subject: [PATCH 02/11] qtbase: qmake: fix mkspecs for darwin

pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch

+1 −1
Original line number Diff line number Diff line 
From 8ce66fca339d9daf6bd132771c2ea582a461f31c Mon Sep 17 00:00:00 2001

From 6088085d3074316dd74639fc6c1233e5862aff11 Mon Sep 17 00:00:00 2001

From: Nick Cao <nickcao@nichi.co>

Date: Fri, 14 Apr 2023 09:34:46 +0800

Subject: [PATCH 03/11] qtbase: qmake: fix includedir in generated pkg-config

pkgs/development/libraries/qt-6/patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch→pkgs/development/libraries/qt-6/patches/0004-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch

+2 −2
Original line number Diff line number Diff line 
From 880fe5653a86d8091f3f577977f8af93552c48fd Mon Sep 17 00:00:00 2001

From 82e243f326aea40e7f3da935d8166979b11e8063 Mon Sep 17 00:00:00 2001

From: Nick Cao <nickcao@nichi.co>

Date: Tue, 21 Mar 2023 15:48:49 +0800

Subject: [PATCH 05/11] qtbase: deal with a font face at index 0 as Regular for

Subject: [PATCH 04/11] qtbase: deal with a font face at index 0 as Regular for

 Variable fonts



Reference: https://bugreports.qt.io/browse/QTBUG-111994