deepin-compressor: 5.12.23 -> 5.12.24

authored by rewine and committed by rewine 7141db2c cf235cdb

+33 -4
+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 +
+13 -4
pkgs/desktops/deepin/apps/deepin-compressor/default.nix
··· 20 20 21 21 stdenv.mkDerivation rec { 22 22 pname = "deepin-compressor"; 23 - version = "5.12.23"; 23 + version = "5.12.24"; 24 24 25 25 src = fetchFromGitHub { 26 26 owner = "linuxdeepin"; 27 27 repo = pname; 28 28 rev = version; 29 - hash = "sha256-8qfpNM2rci4subdodxfJZLP3OvAxXl7QRl4MHGr15nA="; 29 + hash = "sha256-XNhG28VZifQrl3TZfx/OHnsAOo0eKrhGKDk+OjOYD8k="; 30 30 }; 31 31 32 + patches = [ 33 + ./0001-fix-build-on-new-dtk.diff 34 + ]; 35 + 32 36 postPatch = '' 33 37 substituteInPlace src/source/common/pluginmanager.cpp \ 34 - --replace "/usr/lib/" "$out/lib/" 38 + --replace-fail "/usr/lib/" "$out/lib/" 35 39 substituteInPlace src/desktop/deepin-compressor.desktop \ 36 - --replace "/usr" "$out" 40 + --replace-fail "/usr" "$out" 37 41 ''; 38 42 39 43 nativeBuildInputs = [ ··· 59 63 cmakeFlags = [ 60 64 "-DVERSION=${version}" 61 65 "-DUSE_TEST=OFF" 66 + ]; 67 + 68 + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 69 + qtWrapperArgs = [ 70 + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 62 71 ]; 63 72 64 73 strictDeps = true;