File fix-build-on-new-dtk.patch of Package deepin-clone
diff -Nur deepin-clone-5.0.15/app/src/main.cpp deepin-clone-5.0.15-new/app/src/main.cpp
--- deepin-clone-5.0.15/app/src/main.cpp 2023-04-25 10:08:45.000000000 +0800
+++ deepin-clone-5.0.15-new/app/src/main.cpp 2023-12-05 20:16:35.438334128 +0800
@@ -97,8 +97,8 @@
rollingFileAppender->setLogFilesLimit(5);
rollingFileAppender->setDatePattern(RollingFileAppender::DailyRollover);
- logger->registerAppender(rollingFileAppender);
- logger->registerAppender(consoleAppender);
+ dlogger->registerAppender(rollingFileAppender);
+ dlogger->registerAppender(consoleAppender);
if (qEnvironmentVariableIsSet("PKEXEC_UID")) {
const quint32 pkexec_uid = qgetenv("PKEXEC_UID").toUInt();
@@ -176,8 +176,8 @@
rollingFileAppender->setLogFilesLimit(5);
rollingFileAppender->setDatePattern(RollingFileAppender::DailyRollover);
- logger->registerCategoryAppender("deepin.ghost", consoleAppender);
- logger->registerCategoryAppender("deepin.ghost", rollingFileAppender);
+ dlogger->registerCategoryAppender("deepin.ghost", consoleAppender);
+ dlogger->registerCategoryAppender("deepin.ghost", rollingFileAppender);
#endif
parser.parse();
diff -Nur deepin-clone-5.0.15/honest_child/main.cpp deepin-clone-5.0.15-new/honest_child/main.cpp
--- deepin-clone-5.0.15/honest_child/main.cpp 2023-04-25 10:08:45.000000000 +0800
+++ deepin-clone-5.0.15-new/honest_child/main.cpp 2023-12-05 20:21:25.232723321 +0800
@@ -9,11 +9,15 @@
#include <QDebug>
#include <QThread>
+#include <dtkwidget_global.h>
+#include <dtkgui_global.h>
#include <DDesktopServices>
#include <unistd.h>
#include <stdio.h>
+DGUI_USE_NAMESPACE
+
class Thread : public QThread
{
public:
@@ -80,7 +84,7 @@
Q_UNUSED(app)
QDesktopServices::openUrl(QUrl(QString::fromUtf8(qgetenv(DEEPIN_CLONE_OPEN_URL))));
} else if (qEnvironmentVariableIsSet(DEEPIN_CLONE_SHOW_FILE)) {
- DTK_WIDGET_NAMESPACE::DDesktopServices::showFileItem(QString::fromUtf8(qgetenv(DEEPIN_CLONE_SHOW_FILE)));
+ DWIDGET_USE_NAMESPACE::DDesktopServices::showFileItem(QString::fromUtf8(qgetenv(DEEPIN_CLONE_SHOW_FILE)));
} else {
return -1;
}