pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #299721 from wineee/deepin-compressor-6.0.1

deepin.deepin-compressor: 5.12.24 -> 6.0.1

authored by Sandro and committed by GitHub b488f65e b1741ce9

+3 -27
unified split
-20
pkgs/desktops/deepin/apps/deepin-compressor/0001-fix-build-on-new-dtk.diff
··· 1 - diff --git a/src/source/common/ddesktopservicesthread.h b/src/source/common/ddesktopservicesthread.h 2 - index 49313744..456a5e96 100644 3 - --- a/src/source/common/ddesktopservicesthread.h 4 - +++ b/src/source/common/ddesktopservicesthread.h 5 - @@ -8,10 +8,14 @@ 6 - 7 - #include <QThread> 8 - 9 - +#include <dtkwidget_global.h> 10 - +#include <dtkgui_global.h> 11 - #include <DDesktopServices> 12 - #include <QDebug> 13 - #include <QFileInfo> 14 - + 15 - DWIDGET_USE_NAMESPACE 16 - +DGUI_USE_NAMESPACE 17 - 18 - // 文管打开文件目录线程 19 - class DDesktopServicesThread : public QThread 20 -
+3 -7
pkgs/desktops/deepin/apps/deepin-compressor/default.nix
··· 20 20 21 21 stdenv.mkDerivation rec { 22 22 pname = "deepin-compressor"; 23 - version = "5.12.24"; 23 + version = "6.0.1"; 24 24 25 25 src = fetchFromGitHub { 26 26 owner = "linuxdeepin"; 27 27 repo = pname; 28 28 rev = version; 29 - hash = "sha256-XNhG28VZifQrl3TZfx/OHnsAOo0eKrhGKDk+OjOYD8k="; 29 + hash = "sha256-DUpYb1xNmWpBcKo9kajeVm/+z4yj2OBE+qOyEkCHbUI="; 30 30 }; 31 31 32 - patches = [ 33 - ./0001-fix-build-on-new-dtk.diff 34 - ]; 35 - 36 32 postPatch = '' 37 33 substituteInPlace src/source/common/pluginmanager.cpp \ 38 - --replace-fail "/usr/lib/" "$out/lib/" 34 + --replace-fail "/usr/lib" "$out/lib" 39 35 substituteInPlace src/desktop/deepin-compressor.desktop \ 40 36 --replace-fail "/usr" "$out" 41 37 '';