Unverified Commit 7271def4 authored by K900's avatar K900 Committed by GitHub
Browse files

qt6: 6.7.3 -> 6.8.0 (#347268)

parents a3ccb7f5 10d94780

maintainers/scripts/fetch-kde-qt.sh

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ files_before=$(grep -c 'src = ' "$SRCS") 
echo "writing output file $SRCS ..."

cat >"$SRCS" <<EOF

# DO NOT EDIT! This file is generated automatically.

# Command: $0 $@

# Command: ./maintainers/scripts/fetch-kde-qt.sh $@

{ fetchurl, mirror }:



{

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

+9 −9
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ let 
        inherit srcs python3;

        stdenv =

          if stdenv.hostPlatform.isDarwin

          then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "11.0"; }

          then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "12.3"; }

          else stdenv;

      });

    in
@@ -42,7 +42,7 @@ let 
      qtbase = callPackage ./modules/qtbase.nix {

        withGtk3 = !stdenv.hostPlatform.isMinGW;

        inherit (srcs.qtbase) src version;

        inherit (darwin.apple_sdk_11_0.frameworks)

        inherit (darwin.apple_sdk_12_3.frameworks)

          AGL AVFoundation AppKit Contacts CoreBluetooth EventKit GSS MetalKit;

        patches = [

          ./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch
@@ -113,7 +113,7 @@ let 
      qt5compat = callPackage ./modules/qt5compat.nix { };

      qtcharts = callPackage ./modules/qtcharts.nix { };

      qtconnectivity = callPackage ./modules/qtconnectivity.nix {

        inherit (darwin.apple_sdk_11_0.frameworks) IOBluetooth PCSC;

        inherit (darwin.apple_sdk_12_3.frameworks) IOBluetooth PCSC;

      };

      qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { };

      qtdeclarative = callPackage ./modules/qtdeclarative.nix { };
@@ -127,7 +127,7 @@ let 
      qtlottie = callPackage ./modules/qtlottie.nix { };

      qtmultimedia = callPackage ./modules/qtmultimedia.nix {

        inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi;

        inherit (darwin.apple_sdk_11_0.frameworks) VideoToolbox;

        inherit (darwin.apple_sdk_12_3.frameworks) VideoToolbox;

      };

      qtmqtt = callPackage ./modules/qtmqtt.nix { };

      qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { };
@@ -137,7 +137,7 @@ let 
      qtserialport = callPackage ./modules/qtserialport.nix { };

      qtshadertools = callPackage ./modules/qtshadertools.nix { };

      qtspeech = callPackage ./modules/qtspeech.nix {

        inherit (darwin.apple_sdk_11_0.frameworks) Cocoa;

        inherit (darwin.apple_sdk_12_3.frameworks) Cocoa;

      };

      qtquick3d = callPackage ./modules/qtquick3d.nix { };

      qtquick3dphysics = callPackage ./modules/qtquick3dphysics.nix { };
@@ -153,9 +153,9 @@ let 
      qtwebchannel = callPackage ./modules/qtwebchannel.nix { };

      qtwebengine = callPackage ./modules/qtwebengine.nix {

        inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds xnu;

        inherit (darwin.apple_sdk_11_0) libpm libunwind;

        inherit (darwin.apple_sdk_11_0.libs) sandbox;

        inherit (darwin.apple_sdk_11_0.frameworks)

        inherit (darwin.apple_sdk_12_3) libpm libunwind;

        inherit (darwin.apple_sdk_12_3.libs) sandbox;

        inherit (darwin.apple_sdk_12_3.frameworks)

          AGL AVFoundation Accelerate Cocoa CoreLocation CoreML ForceFeedback

          GameController ImageCaptureCore LocalAuthentication

          MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz
@@ -174,7 +174,7 @@ let 
      };

      qtwebsockets = callPackage ./modules/qtwebsockets.nix { };

      qtwebview = callPackage ./modules/qtwebview.nix {

        inherit (darwin.apple_sdk_11_0.frameworks) WebKit;

        inherit (darwin.apple_sdk_12_3.frameworks) WebKit;

      };



      wrapQtAppsHook = callPackage

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.7/6.7.3/submodules/ -A '*.tar.xz' )
 
WGET_ARGS=( https://download.qt.io/official_releases/qt/6.8/6.8.0/submodules/ -A '*.tar.xz' )

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

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


qtModule rec {

  pname = "qtmqtt";

  version = "6.7.3";

  version = "6.8.0";



  src = fetchFromGitHub {

    owner = "qt";

    repo = "qtmqtt";

    rev = "v${version}";

    hash = "sha256-QVLt1nhxYIMmmVY1rZ8pnkXNs0N6hp1o8rv33o8ptxM=";

    hash = "sha256-WvqBEq7Zv1CONMMuDHdj8/nJHoY4y7ysrqliTZHi7x8=";

  };



  propagatedBuildInputs = [ qtbase ];

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

+5 −8
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
, wayland-scanner

, pkg-config

, libdrm

, fetchpatch

}:



qtModule {
@@ -18,11 +17,9 @@ qtModule { 
  buildInputs = [ wayland libdrm ];

  nativeBuildInputs = [ pkg-config ];



  patches = [

    # Update wayland.xml to version 1.23.0

    (fetchpatch {

      url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/c2f61bc47baacf2e6a44c6c3c4e4cbf0abfa4095.diff";

      sha256 = "sha256-ZcK/LT65oFvTzCukZB8aDYWH5L6RK5MOPs8VtpYQpq0=";

    })

  ];

  # Replace vendored wayland.xml with our matching version

  # FIXME: remove when upstream updates past 1.23

  postPatch = ''

    cp ${wayland-scanner}/share/wayland/wayland.xml src/3rdparty/protocol/wayland/wayland.xml

  '';

}