diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-03-30 13:00:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-30 13:00:48 +0100 |
| commit | b488f65e713b57a28a5b1fe176a6ef5b3bb64aa0 (patch) | |
| tree | 6bbd41f93c7b662be6a535842ab975cb0ce0d4a9 | |
| parent | b1741ce936e5790ac60069588db0a98d5c20a8ac (diff) | |
| parent | bd98a8a7f19b6f9f747d1892c4bc8592902f6cb3 (diff) | |
Merge pull request #299721 from wineee/deepin-compressor-6.0.1
deepin.deepin-compressor: 5.12.24 -> 6.0.1
| -rw-r--r-- | pkgs/desktops/deepin/apps/deepin-compressor/0001-fix-build-on-new-dtk.diff | 20 | ||||
| -rw-r--r-- | pkgs/desktops/deepin/apps/deepin-compressor/default.nix | 10 |
2 files changed, 3 insertions, 27 deletions
diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/0001-fix-build-on-new-dtk.diff b/pkgs/desktops/deepin/apps/deepin-compressor/0001-fix-build-on-new-dtk.diff deleted file mode 100644 index 237d5798ecc85..0000000000000 --- a/pkgs/desktops/deepin/apps/deepin-compressor/0001-fix-build-on-new-dtk.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/source/common/ddesktopservicesthread.h b/src/source/common/ddesktopservicesthread.h -index 49313744..456a5e96 100644 ---- a/src/source/common/ddesktopservicesthread.h -+++ b/src/source/common/ddesktopservicesthread.h -@@ -8,10 +8,14 @@ - - #include <QThread> - -+#include <dtkwidget_global.h> -+#include <dtkgui_global.h> - #include <DDesktopServices> - #include <QDebug> - #include <QFileInfo> -+ - DWIDGET_USE_NAMESPACE -+DGUI_USE_NAMESPACE - - // 文管打开文件目录线程 - class DDesktopServicesThread : public QThread - diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix index 60a02851b95a4..8943b84231744 100644 --- a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix @@ -20,22 +20,18 @@ stdenv.mkDerivation rec { pname = "deepin-compressor"; - version = "5.12.24"; + version = "6.0.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-XNhG28VZifQrl3TZfx/OHnsAOo0eKrhGKDk+OjOYD8k="; + hash = "sha256-DUpYb1xNmWpBcKo9kajeVm/+z4yj2OBE+qOyEkCHbUI="; }; - patches = [ - ./0001-fix-build-on-new-dtk.diff - ]; - postPatch = '' substituteInPlace src/source/common/pluginmanager.cpp \ - --replace-fail "/usr/lib/" "$out/lib/" + --replace-fail "/usr/lib" "$out/lib" substituteInPlace src/desktop/deepin-compressor.desktop \ --replace-fail "/usr" "$out" ''; |