deepin-compressor: 5.12.23 -> 5.12.24

This commit is contained in:
rewine 2024-02-04 15:41:33 +08:00 committed by rewine
parent cf235cdb7c
commit 7141db2ce4
2 changed files with 33 additions and 4 deletions

View File

@ -0,0 +1,20 @@
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

View File

@ -20,20 +20,24 @@
stdenv.mkDerivation rec {
pname = "deepin-compressor";
version = "5.12.23";
version = "5.12.24";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-8qfpNM2rci4subdodxfJZLP3OvAxXl7QRl4MHGr15nA=";
hash = "sha256-XNhG28VZifQrl3TZfx/OHnsAOo0eKrhGKDk+OjOYD8k=";
};
patches = [
./0001-fix-build-on-new-dtk.diff
];
postPatch = ''
substituteInPlace src/source/common/pluginmanager.cpp \
--replace "/usr/lib/" "$out/lib/"
--replace-fail "/usr/lib/" "$out/lib/"
substituteInPlace src/desktop/deepin-compressor.desktop \
--replace "/usr" "$out"
--replace-fail "/usr" "$out"
'';
nativeBuildInputs = [
@ -61,6 +65,11 @@ stdenv.mkDerivation rec {
"-DUSE_TEST=OFF"
];
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
qtWrapperArgs = [
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
];
strictDeps = true;
meta = with lib; {