diff --git a/package/rattler-build/pixi.lock b/package/rattler-build/pixi.lock index c3fdfea1d1..3d7fe202d0 100644 --- a/package/rattler-build/pixi.lock +++ b/package/rattler-build/pixi.lock @@ -267,6 +267,7 @@ environments: - conda: https://prefix.dev/conda-forge/linux-64/pyyaml-6.0.3-py311h3778330_0.conda - conda: https://prefix.dev/conda-forge/linux-64/qhull-2020.2-h434a139_5.conda - conda: https://prefix.dev/conda-forge/linux-64/qt6-main-6.8.3-h75f3359_4.conda + - conda: https://prefix.dev/conda-forge/linux-64/qt6-wayland-6.8.3-hf501273_0.conda - conda: https://prefix.dev/conda-forge/linux-64/rapidjson-1.1.0.post20240409-h3f2d84a_2.conda - conda: https://prefix.dev/conda-forge/linux-64/rav1e-0.7.1-h8fae777_3.conda - conda: https://prefix.dev/conda-forge/linux-64/readline-8.3-h853b02a_0.conda @@ -592,6 +593,7 @@ environments: - conda: https://prefix.dev/conda-forge/linux-aarch64/pyyaml-6.0.3-py311h164a683_0.conda - conda: https://prefix.dev/conda-forge/linux-aarch64/qhull-2020.2-h70be974_5.conda - conda: https://prefix.dev/conda-forge/linux-aarch64/qt6-main-6.8.3-he176c03_4.conda + - conda: https://prefix.dev/conda-forge/linux-aarch64/qt6-wayland-6.8.3-h6948401_0.conda - conda: https://prefix.dev/conda-forge/linux-aarch64/rapidjson-1.1.0.post20240409-h5ad3122_2.conda - conda: https://prefix.dev/conda-forge/linux-aarch64/rav1e-0.7.1-ha3529ed_3.conda - conda: https://prefix.dev/conda-forge/linux-aarch64/readline-8.3-hb682ff5_0.conda @@ -4391,6 +4393,7 @@ packages: - vtk - xlutils - libspnav + - qt6-wayland - xcb-util-cursor ==0.1.5 - pcl >=1.15.0,<1.15.1.0a0 - smesh >=9.9.0.0,<9.9.1.0a0 @@ -4453,6 +4456,7 @@ packages: - vtk - xlutils - libspnav + - qt6-wayland - xcb-util-cursor ==0.1.5 - __glibc >=2.17,<3.0.a0 - smesh >=9.9.0.0,<9.9.1.0a0 @@ -15712,6 +15716,61 @@ packages: license_family: LGPL size: 92900449 timestamp: 1750923594107 +- conda: https://prefix.dev/conda-forge/linux-64/qt6-wayland-6.8.3-hf501273_0.conda + sha256: 82d09a7bd753766f06b3c81696053a24637b9e33e4f32baf32ca071f51273760 + md5: 984c2eefffc5d3937883b10748d16a34 + depends: + - __glibc >=2.17,<3.0.a0 + - fontconfig >=2.15.0,<3.0a0 + - fonts-conda-ecosystem + - freetype >=2.13.3,<3.0a0 + - libegl >=1.7.0,<2.0a0 + - libgcc >=13 + - libgl >=1.7.0,<2.0a0 + - libglib >=2.84.0,<3.0a0 + - libglx >=1.7.0,<2.0a0 + - libopengl >=1.7.0,<2.0a0 + - libstdcxx >=13 + - libxkbcommon >=1.8.1,<2.0a0 + - libzlib >=1.3.1,<2.0a0 + - qt6-main 6.8.3.* + - qt6-main >=6.8.3,<6.9.0a0 + - wayland >=1.23.1,<2.0a0 + - xorg-libx11 >=1.8.12,<2.0a0 + - xorg-libxcomposite >=0.4.6,<1.0a0 + - xorg-libxext >=1.3.6,<2.0a0 + - xorg-libxrandr >=1.5.4,<2.0a0 + license: LGPL-3.0-only + license_family: LGPL + size: 1550598 + timestamp: 1743159191270 +- conda: https://prefix.dev/conda-forge/linux-aarch64/qt6-wayland-6.8.3-h6948401_0.conda + sha256: 775a5615e3f763920f91366014a4111c58907694615c1d03752e0efcb5db2fdc + md5: 55b2a18347cd8fc340ecd553c70a8eee + depends: + - fontconfig >=2.15.0,<3.0a0 + - fonts-conda-ecosystem + - freetype >=2.13.3,<3.0a0 + - libegl >=1.7.0,<2.0a0 + - libgcc >=13 + - libgl >=1.7.0,<2.0a0 + - libglib >=2.84.0,<3.0a0 + - libglx >=1.7.0,<2.0a0 + - libopengl >=1.7.0,<2.0a0 + - libstdcxx >=13 + - libxkbcommon >=1.8.1,<2.0a0 + - libzlib >=1.3.1,<2.0a0 + - qt6-main 6.8.3.* + - qt6-main >=6.8.3,<6.9.0a0 + - wayland >=1.23.1,<2.0a0 + - xorg-libx11 >=1.8.12,<2.0a0 + - xorg-libxcomposite >=0.4.6,<1.0a0 + - xorg-libxext >=1.3.6,<2.0a0 + - xorg-libxrandr >=1.5.4,<2.0a0 + license: LGPL-3.0-only + license_family: LGPL + size: 1639641 + timestamp: 1743262388133 - conda: https://prefix.dev/conda-forge/linux-64/rapidjson-1.1.0.post20240409-h3f2d84a_2.conda sha256: f87f265263a1ddbc50b98e2c2bcaa2bac63da3acc09267815dd0f4bd614cd902 md5: 65e2f30d532b4ae2063a424c185cc678 diff --git a/package/rattler-build/recipe.yaml b/package/rattler-build/recipe.yaml index d6c4c2cb7a..a7af929af4 100644 --- a/package/rattler-build/recipe.yaml +++ b/package/rattler-build/recipe.yaml @@ -178,4 +178,5 @@ requirements: - if: linux then: - libspnav + - qt6-wayland - xcb-util-cursor==0.1.5 ## hack to address https://github.com/FreeCAD/FreeCAD/issues/26726 diff --git a/pixi.toml b/pixi.toml index e714948d43..6d240ab4dc 100644 --- a/pixi.toml +++ b/pixi.toml @@ -92,7 +92,7 @@ mesa-libgl-cos7-x86_64 = "*" mesa-libgl-devel-cos7-x86_64 = "*" mold = "*" pixman-cos7-x86_64 = "*" -qt6-wayland = "*" +qt6-wayland = ">=6.8,<6.9" sed = "*" sysroot_linux-64 = "*" xcb-util-cursor = "==0.1.5" ## hack to address https://github.com/FreeCAD/FreeCAD/issues/26726 @@ -132,7 +132,7 @@ mesa-libgl-devel-cos7-aarch64 = "*" mesa-libglapi-cos7-aarch64 = "*" mold = "*" pixman-cos7-aarch64 = "*" -qt6-wayland = "*" +qt6-wayland = ">=6.8,<6.9" sed = "*" sysroot_linux-aarch64 = "*" xcb-util-cursor = "==0.1.5" ## hack to address https://github.com/FreeCAD/FreeCAD/issues/26726