Unverified Commit 47a0bced authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #270439 from NickCao/qt-661 

qt6: 6.6.0 -> 6.6.1
parents 4c7c5d47 64c132c4

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

+15 −8
Original line number Diff line number Diff line
@@ -51,14 +51,21 @@ 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

          # Revert "macOS: Silence warning about supporting secure state restoration"

          # fix build with macOS sdk < 12.0

          (fetchpatch2 {

            url = "https://github.com/qt/qtbase/commit/fc1549c01445bb9c99d3ba6de8fa9da230614e72.patch";

            revert = true;

            hash = "sha256-cjB2sC4cvZn0UEc+sm6ZpjyC78ssqB1Kb5nlZQ15M4A=";

          })

        ];

      };

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

pkgs/development/libraries/qt-6/fetch.sh

+1 −1
Original line number Diff line number Diff line 
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.6/6.6.0/submodules/ -A '*.tar.xz' )
 
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.6/6.6.1/submodules/ -A '*.tar.xz' )

pkgs/development/libraries/qt-6/modules/qtbase.nix

+3 −3
Original line number Diff line number Diff line
@@ -11,11 +11,9 @@ 
, lndir

, perl

, pkg-config

, python3

, which

, cmake

, ninja

, ccache

, xmlstarlet

, libproxy

, xorg
@@ -236,11 +234,13 @@ stdenv.mkDerivation rec { 
    "-DQT_FEATURE_cxx17_filesystem=OFF"

  ] ++ lib.optional (qttranslations != null) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations";



  NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [

  env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [

    # Undefined symbols for architecture arm64: "___gss_c_nt_hostbased_service_oid_desc"

    "-framework GSS"

  ]);



  env.NIX_CFLAGS_COMPILE = "-DNIXPKGS_QT_PLUGIN_PREFIX=\"${qtPluginPrefix}\"";



  outputs = [ "out" "dev" ];



  moveToDev = false;

pkgs/development/libraries/qt-6/modules/qtmqtt.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,12 +5,12 @@ 


qtModule rec {

  pname = "qtmqtt";

  version = "6.6.0";

  version = "6.6.1";

  src = fetchFromGitHub {

    owner = "qt";

    repo = "qtmqtt";

    rev = "v${version}";

    hash = "sha256-rFi1w0Z4jLvHvhu0/VOIT0MWmKjy51jSK5M56qLs0gI=";

    hash = "sha256-6jQrUT1wLk6rhDIns0ubdUCZ7e/m38Oqvl8c1/sfWxI=";

  };

  propagatedBuildInputs = [ qtbase ];

}

pkgs/development/libraries/qt-6/modules/qtsvg.nix

+0 −10
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
, libmng

, zlib

, pkg-config

, fetchpatch2

}:



qtModule {
@@ -13,13 +12,4 @@ qtModule { 
  propagatedBuildInputs = [ qtbase ];

  buildInputs = [ libwebp jasper libmng zlib ];

  nativeBuildInputs = [ pkg-config ];

  patches = [

    # Fix nullptr dereference with invalid SVG

    # https://bugreports.qt.io/projects/QTBUG/issues/QTBUG-117944

    (fetchpatch2 {

      name = "QTBUG-117944.patch";

      url = "https://code.qt.io/cgit/qt/qtsvg.git/patch/?id=edc8ca7f";

      hash = "sha256-kBQYlQqPb0QkRhatQyaGdxE1Y5zHd6/ZEd5zn0gRVoM=";

    })

  ];

}