deepin desktop environment: 2024.12 update (#363854)

2025-02-22 03:53:47 +00:00 · 2024-12-12 10:50:31 +08:00 · 2024-12-12 10:50:31 +08:00 · 41758a727f
commit 41758a727f
parent 0b5d092b49 110658a687
14 changed files with 60 additions and 195 deletions
--- a/pkgs/desktops/deepin/core/dde-application-manager/default.nix
+++ b/pkgs/desktops/deepin/core/dde-application-manager/default.nix
@ -10,13 +10,13 @@

 stdenv.mkDerivation rec {
  pname = "dde-application-manager";
-  version = "1.2.15";
+  version = "1.2.19";

  src = fetchFromGitHub {
    owner = "linuxdeepin";
    repo = pname;
    rev = version;
-    hash = "sha256-9WKKM3SAMgW+UL0DnzDFqA+HHi7euF/yyTyKSbrIgV4=";
+    hash = "sha256-KUwX7oilV562WDxkBhTQhwz2lgcQIYwkmRRglWj0zh8=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix
+++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix
@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "dde-launchpad";
-  version = "1.0.2";
+  version = "1.0.8";

  src = fetchFromGitHub {
    owner = "linuxdeepin";
    repo = pname;
    rev = version;
-    hash = "sha256-kczdSd9+ZmMZQ2fWg3SRW+CS/aWktYLz/H+Ky81TwVM=";
+    hash = "sha256-2arO1WSILY5TVPBvdyhttssddwhMYIBcCGq/pW/DnB0=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/deepin/core/dde-shell/default.nix
+++ b/pkgs/desktops/deepin/core/dde-shell/default.nix
@ -13,26 +13,27 @@
  qt6integration,
  qt6platform-plugins,
  dde-tray-loader,
+  dde-application-manager,
  wayland,
  wayland-protocols,
+  treeland-protocols,
  yaml-cpp,
  xorg,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "dde-shell";
-  version = "1.0.2";
+  version = "1.0.9";

  src = fetchFromGitHub {
    owner = "linuxdeepin";
    repo = "dde-shell";
    rev = finalAttrs.version;
-    hash = "sha256-I3z6HL1h3qmLfOrwhyLhtSz3og4kHcAdlHJx4+SgPRo=";
+    hash = "sha256-Gko1fFut5zWH/L6X5hEe5OZBjRIbKWIrrjjhh2wrsCg=";
  };

  patches = [
    ./fix-path-for-nixos.diff
-    ./fix-dock-can-not-show-with-qt6_8.diff
  ];

  postPatch = ''
@ -56,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs = [
    dde-tray-loader
+    dde-application-manager
    dtk6declarative
    dtk6widget
    dde-qt-dbus-factory
@ -66,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
    qt6integration
    wayland
    wayland-protocols
+    treeland-protocols
    yaml-cpp
    xorg.libXcursor
    xorg.libXres
--- a/pkgs/desktops/deepin/core/dde-shell/fix-dock-can-not-show-with-qt6_8.diff
+++ b/pkgs/desktops/deepin/core/dde-shell/fix-dock-can-not-show-with-qt6_8.diff
@ -1,20 +0,0 @@
-diff --git a/panels/dock/OverflowContainer.qml b/panels/dock/OverflowContainer.qml
-index 74ca966..312f2a0 100644
--- a/panels/dock/OverflowContainer.qml
-+++ b/panels/dock/OverflowContainer.qml
-@@ -52,13 +52,13 @@ Item {
-         for (let child of listView.contentItem.visibleChildren) {
-             width = calculateImplicitWidth(width, child.implicitWidth)
-         }
-        return width
-+        return Math.max(width, 1)
-     }
-     implicitHeight: {
-         let height = 0
-         for (let child of listView.contentItem.visibleChildren) {
-             height = calculateImplicitHeight(height, child.implicitHeight)
-         }
-        return height
-+        return Math.max(height, 1)
-     }
- }
--- a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix
+++ b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix
@ -18,13 +18,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "dde-tray-loader";
-  version = "1.0.1";
+  version = "1.0.7";

  src = fetchFromGitHub {
    owner = "linuxdeepin";
    repo = "dde-tray-loader";
    rev = finalAttrs.version;
-    hash = "sha256-FEvoVgwzDYN23TJxu1kRSMSbS4hELYFFByxOsEO9JKE=";
+    hash = "sha256-LzRjOl3kHArpxwerh7XOisYIJ+t+r/zWUbvYh6k6zKw=";
  };

  patches = [
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@ -39,6 +39,7 @@ let
      qt6platform-plugins = callPackage ./library/qt6platform-plugins { };
      qt6integration = callPackage ./library/qt6integration { };
      qt6mpris = callPackage ./library/qt6mpris { };
+      treeland-protocols = callPackage ./library/treeland-protocols { };

      #### CORE
      deepin-kwin = callPackage ./core/deepin-kwin { };
--- a/pkgs/desktops/deepin/library/dtk6core/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6core/default.nix
@ -2,7 +2,6 @@
  stdenv,
  lib,
  fetchFromGitHub,
-  fetchpatch,
  cmake,
  pkg-config,
  doxygen,
@ -15,23 +14,18 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "dtk6core";
-  version = "6.0.19";
+  version = "6.0.24";

  src = fetchFromGitHub {
    owner = "linuxdeepin";
    repo = "dtk6core";
    rev = finalAttrs.version;
-    hash = "sha256-3MwvTnjtVVcMjQa1f4UdagEtWhJj8aDgfUlmnGo/R7s=";
+    hash = "sha256-51TvPQy0b/8kkBs0e3q1B53mEAKHpAYPBla4h1k616c=";
  };

  patches = [
    ./fix-pkgconfig-path.patch
    ./fix-pri-path.patch
-    (fetchpatch {
-      name = "fix-build-on-qt-6.8.patch";
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6core/-/raw/d2e991f96b2940e8533b7e944bab5a7dd6aa0fb7/qt-6.8.patch";
-      hash = "sha256-HZxUrtUmVwnNUwcBoU7ewb+McsRkALQglPBbJU8HTkk=";
-    })
  ];

  postPatch = ''
--- a/pkgs/desktops/deepin/library/dtk6declarative/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6declarative/default.nix
@ -11,19 +11,18 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "dtk6declarative";
-  version = "6.0.19";
+  version = "6.0.24";

  src = fetchFromGitHub {
    owner = "linuxdeepin";
    repo = "dtk6declarative";
    rev = finalAttrs.version;
-    hash = "sha256-BxWPLJeuQDbNg4UoyHD/VAMV2QFWDjWZiFx5JOEmLxg=";
+    hash = "sha256-i6gkVWs6CQC6i6H6lfrWNYT76fFBc8ECZ1ePvXQ7j8E=";
  };

  patches = [
    ./fix-pkgconfig-path.patch
    ./fix-pri-path.patch
-    ./fix-build-on-qt-6.8.patch
  ];

  nativeBuildInputs = [
--- a/pkgs/desktops/deepin/library/dtk6declarative/fix-build-on-qt-6.8.patch
+++ b/pkgs/desktops/deepin/library/dtk6declarative/fix-build-on-qt-6.8.patch
@ -1,135 +0,0 @@
-diff --git a/qt6/src/CMakeLists.txt b/qt6/src/CMakeLists.txt
-index 4314b72..a7ecaf1 100644
--- a/qt6/src/CMakeLists.txt
-+++ b/qt6/src/CMakeLists.txt
-@@ -25,6 +25,7 @@ dtk_extend_target(${PLUGIN_NAME} EnableCov ${ENABLE_COV})
- qt_add_translations(${LIB_NAME}
-     TS_FILES ${TS_FILES}
-     QM_FILES_OUTPUT_VARIABLE QM_FILES
-+    IMMEDIATE_CALL
- )
- 
- set_target_properties(${LIB_NAME} PROPERTIES
-diff --git a/src/private/dbackdropnode.cpp b/src/private/dbackdropnode.cpp
-index 91c398a..1ed0ad8 100644
--- a/src/private/dbackdropnode.cpp
-+++ b/src/private/dbackdropnode.cpp
-@@ -320,8 +320,8 @@ public:
-             renderer->setDevicePixelRatio(base->devicePixelRatio());
-             renderer->setDeviceRect(base->deviceRect());
-             renderer->setViewportRect(base->viewportRect());
-            renderer->setProjectionMatrix(base->projectionMatrix());
-            renderer->setProjectionMatrixWithNativeNDC(base->projectionMatrixWithNativeNDC());
-+            renderer->setProjectionMatrix(base->projectionMatrix(0));
-+            renderer->setProjectionMatrixWithNativeNDC(base->projectionMatrixWithNativeNDC(0));
-         } else {
-             renderer->setDevicePixelRatio(1.0);
-             renderer->setDeviceRect(QRect(QPoint(0, 0), pixelSize));
-@@ -336,8 +336,8 @@ public:
-         }
- 
-         if (Q_UNLIKELY(!matrix.isIdentity())) {
-            renderer->setProjectionMatrix(renderer->projectionMatrix() * matrix);
-            renderer->setProjectionMatrixWithNativeNDC(renderer->projectionMatrixWithNativeNDC() * matrix);
-+            renderer->setProjectionMatrix(renderer->projectionMatrix(0) * matrix);
-+            renderer->setProjectionMatrixWithNativeNDC(renderer->projectionMatrixWithNativeNDC(0) * matrix);
-         }
- 
-         renderer->setRootNode(rootNode);
-diff --git a/src/private/dmaskeffectnode.cpp b/src/private/dmaskeffectnode.cpp
-index c4db07d..da1e4ce 100644
--- a/src/private/dmaskeffectnode.cpp
-+++ b/src/private/dmaskeffectnode.cpp
-@@ -35,7 +35,7 @@ protected:
- class OpaqueTextureMaterialShader : public QSGOpaqueTextureMaterialRhiShader
- {
- public:
-    OpaqueTextureMaterialShader();
-+    OpaqueTextureMaterialShader(int viewCount);
- 
-     bool updateUniformData(RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial)  override;
- 
-@@ -48,7 +48,7 @@ public:
- class TextureMaterialShader : public OpaqueTextureMaterialShader
- {
- public:
-    TextureMaterialShader();
-+    TextureMaterialShader(int viewCount);
- 
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-     void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect) override;
-@@ -61,7 +61,8 @@ protected:
- #endif
- };
- 
-OpaqueTextureMaterialShader::OpaqueTextureMaterialShader()
-+OpaqueTextureMaterialShader::OpaqueTextureMaterialShader(int viewCount)
-+ : QSGOpaqueTextureMaterialRhiShader(viewCount)
- {
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
- #if QT_CONFIG(opengl)
-@@ -236,8 +237,8 @@ bool OpaqueTextureMaterialShader::updateGraphicsPipelineState(RenderState &state
- }
- #endif
- 
-TextureMaterialShader::TextureMaterialShader()
-    : OpaqueTextureMaterialShader()
-+TextureMaterialShader::TextureMaterialShader(int viewCount)
-+    : OpaqueTextureMaterialShader(viewCount)
- {
- #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // TODO qt6
- #if QT_CONFIG(opengl)
-@@ -529,7 +530,7 @@ QSGMaterialShader *TextureMaterial::createShader() const
- QSGMaterialShader *TextureMaterial::createShader(QSGRendererInterface::RenderMode renderMode) const
- {
-     Q_UNUSED(renderMode)
-    return new TextureMaterialShader;
-+    return new TextureMaterialShader(viewCount());
- }
- #endif
- 
-@@ -553,7 +554,7 @@ QSGMaterialShader *OpaqueTextureMaterial::createShader() const
- QSGMaterialShader *OpaqueTextureMaterial::createShader(QSGRendererInterface::RenderMode renderMode) const
- {
-     Q_UNUSED(renderMode)
-    return new OpaqueTextureMaterialShader;
-+    return new OpaqueTextureMaterialShader(viewCount());
- }
- #endif
- 
-diff --git a/src/private/drectanglenode.cpp b/src/private/drectanglenode.cpp
-index efeeab6..b961588 100644
--- a/src/private/drectanglenode.cpp
-+++ b/src/private/drectanglenode.cpp
-@@ -72,7 +72,8 @@ void CornerColorShader::initialize()
-     m_idQtOpacity = program->uniformLocation("qt_Opacity");
- }
- #else
-CornerColorShader::CornerColorShader()
-+CornerColorShader::CornerColorShader(int viewCount)
-+    : QSGOpaqueTextureMaterialRhiShader(viewCount)
- {
-     setShaderFileName(QSGMaterialShader::VertexStage, QStringLiteral(":/dtk/declarative/shaders_ng/cornerscolorshader.vert.qsb"));
-     setShaderFileName(QSGMaterialShader::FragmentStage, QStringLiteral(":/dtk/declarative/shaders_ng/cornerscolorshader.frag.qsb"));
-@@ -128,7 +129,7 @@ QSGMaterialShader *CornerColorMaterial::createShader() const
- QSGMaterialShader *CornerColorMaterial::createShader(QSGRendererInterface::RenderMode renderMode) const
- {
-     Q_UNUSED(renderMode)
-    return new CornerColorShader;
-+    return new CornerColorShader(viewCount());
- }
- #endif
- 
-diff --git a/src/private/drectanglenode_p.h b/src/private/drectanglenode_p.h
-index aee5a7c..7962154 100644
--- a/src/private/drectanglenode_p.h
-+++ b/src/private/drectanglenode_p.h
-@@ -37,7 +37,7 @@ private:
- class CornerColorShader : public QSGOpaqueTextureMaterialRhiShader
- {
- public:
-    CornerColorShader();
-+    CornerColorShader(int viewCount);
-     bool updateUniformData(RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial);
- };
- #endif
--- a/pkgs/desktops/deepin/library/dtk6gui/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6gui/default.nix
@ -2,7 +2,6 @@
  stdenv,
  lib,
  fetchFromGitHub,
-  fetchpatch,
  cmake,
  pkg-config,
  doxygen,
@ -13,23 +12,18 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "dtk6gui";
-  version = "6.0.19";
+  version = "6.0.24";

  src = fetchFromGitHub {
    owner = "linuxdeepin";
    repo = "dtk6gui";
    rev = finalAttrs.version;
-    hash = "sha256-nqwkBMcCQiW4iqYhceTaSNNxoR5tvCNfjKUVVHkzN3A=";
+    hash = "sha256-Ybi68lTSUJpAipx92JF7wj6y+GTYDodJKRCVFhfnBvQ=";
  };

  patches = [
    ./fix-pkgconfig-path.patch
    ./fix-pri-path.patch
-    (fetchpatch {
-      name = "fix-build-on-qt-6.8.patch";
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6gui/-/raw/b6b8521fd69c28dbca5f6e8d1d8258c904b6caf1/qt-6.8.patch";
-      hash = "sha256-Fu5vwvKJGMW94JYoIPvDCeXs8WrAskQlVRX/3FYQFGY=";
-    })
  ];

  postPatch = ''
@ -47,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs = [
    qt6Packages.qtbase
+    qt6Packages.qtwayland
    librsvg
  ];

--- a/pkgs/desktops/deepin/library/dtk6widget/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6widget/default.nix
@ -2,7 +2,6 @@
  stdenv,
  lib,
  fetchFromGitHub,
-  fetchpatch,
  cmake,
  pkg-config,
  doxygen,
@ -14,23 +13,18 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "dtk6widget";
-  version = "6.0.19";
+  version = "6.0.24";

  src = fetchFromGitHub {
    owner = "linuxdeepin";
    repo = "dtk6widget";
    rev = finalAttrs.version;
-    hash = "sha256-VlFzecX76RMNSBpnMc9HwMPZ5z3zzzkcVcNlGKSShyA=";
+    hash = "sha256-aDuLybIEzF8ATzH6vkN2SS/yn1eAc2WooNZxeQyH2QM=";
  };

  patches = [
    ./fix-pkgconfig-path.patch
    ./fix-pri-path.patch
-    (fetchpatch {
-      name = "fix-build-on-qt-6.8.patch";
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6widget/-/raw/c4ac094715daa4ec319dc4d55bbca9d818845f82/qt-6.8.patch";
-      hash = "sha256-XEgtAV0mF1+C26wCaukjuv4WNbP4ISGgXt/eav7h9ko=";
-    })
  ];

  postPatch = ''
--- a/pkgs/desktops/deepin/library/qt6integration/default.nix
+++ b/pkgs/desktops/deepin/library/qt6integration/default.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation rec {
  pname = "qt6integration";
-  version = "6.0.19";
+  version = "6.0.24";

  src = fetchFromGitHub {
    owner = "linuxdeepin";
    repo = pname;
    rev = version;
-    hash = "sha256-RVhAuEthrTE1QkRIKmBK4VM86frgAqLMJL31F11H8R8=";
+    hash = "sha256-J0HKtxnQCizHFf2VR9srS/CxWqAkczia7kDWxvGzKsw=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
+++ b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
@ -12,13 +12,13 @@

 stdenv.mkDerivation rec {
  pname = "qt6platform-plugins";
-  version = "6.0.19";
+  version = "6.0.24";

  src = fetchFromGitHub {
    owner = "linuxdeepin";
    repo = pname;
    rev = version;
-    hash = "sha256-aHqm+WKZLoUymiMFfrF3jgWrxgq51d6yTXWiOMsFgiQ=";
+    hash = "sha256-Ih3VlEv2hl8y/Cc5uI8gQFgIVvcCaHUhHAudNOSqfs4=";
  };

  postUnpack = ''
--- a/pkgs/desktops/deepin/library/treeland-protocols/default.nix
+++ b/pkgs/desktops/deepin/library/treeland-protocols/default.nix
@ -0,0 +1,34 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "treeland-protocols";
+  version = "0.4.5";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    hash = "sha256-SS4jnfr/9Ec3qpnHS4EjQViekBRMix5oz7b9qhNZpfY=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  meta = {
+    description = "Wayland protocol extensions for treeland";
+    homepage = "https://github.com/linuxdeepin/treeland-protocols";
+    license = with lib.licenses; [
+      gpl3Only
+      lgpl3Only
+      asl20
+    ];
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
+  };
+}