fix bugs

3rdparty/deepin-pdfium/include/dpdfglobal.h

@@ -6,7 +6,7 @@
 #include <QDebug>
 #include <QElapsedTimer>
 #include <QRectF>
-#include <QMutex>
+#include <QRecursiveMutex>
 
 #ifndef BUILD_DEEPDF_STATIC
 #    if defined(BUILD_DEEPDF_LIB)
@@ -46,7 +46,7 @@ class DPdfGlobal
 };
 
 //pdfium即使不同文档之间loadpage和renderpage也不是线程安全，需要加锁
-class DPdfMutexLocker : public QMutexLocker<QMutex>
+class DPdfMutexLocker : public QMutexLocker<QRecursiveMutex>
 {
 public:
     explicit DPdfMutexLocker(const QString &tmpLog);

3rdparty/deepin-pdfium/src/dpdfglobal.cpp

@@ -1,7 +1,5 @@
 #include <QtCore>
 #include <QString>
-#include <QMutex>
-#include <QMutexLocker>
 #include <QDebug>
 #include "dpdfglobal.h"
 #include "public/fpdfview.h"
@@ -47,9 +45,9 @@ QString DPdfGlobal::textCodeType(const char *text)
     return encodeind;
 }
 
-Q_GLOBAL_STATIC_WITH_ARGS(QMutex, pdfMutex, ());
+Q_GLOBAL_STATIC(QRecursiveMutex, pdfMutex);
 
-DPdfMutexLocker::DPdfMutexLocker(const QString &tmpLog): QMutexLocker<QMutex>(pdfMutex())
+DPdfMutexLocker::DPdfMutexLocker(const QString &tmpLog): QMutexLocker<QRecursiveMutex>(pdfMutex())
 {
     m_log = tmpLog;
     qInfo() << m_log + " begin ";

arm64/linglong.yaml

@@ -7,7 +7,7 @@ version: "1"
 package:
   id: org.deepin.reader
   name: "deepin-reader"
-  version: 6.5.12.1
+  version: 6.5.13.1
   kind: app
   description: |
     reader for deepin os.

debian/changelog

@@ -1,3 +1,12 @@
+deepin-reader (6.5.13) unstable; urgency=medium
+
+  * update version to 6.5.13
+  * fix: fix fail to open .docx file
+  * fix: fix app stuck when checking document info
+  * chore: update linglong.yaml for translations
+
+ -- wangrong <wangrong@uniontech.com>  Thu, 20 Feb 2025 18:52:13 +0800
+
 deepin-reader (6.5.12) unstable; urgency=medium
 
   * Update version to 6.5.12

linglong.yaml

@@ -7,7 +7,7 @@ version: "1"
 package:
   id: org.deepin.reader
   name: "deepin-reader"
-  version: 6.5.12.1
+  version: 6.5.13.1
   kind: app
   description: |
     reader for deepin os.
@@ -25,6 +25,7 @@ build: |
   find . -type f -name "src.pro" -exec sed -i '33i INCLUDEPATH += $$INCPATHS' {} +
   find . -type f -name "htmltopdf.pro" -exec sed -i '35i INCLUDEPATH += $$INCPATHS' {} +
   sed -i '2i INCLUDEPATH += $$INCPATHS' reader/reader.pro
+  sed -i 's|/usr/lib/qt6/bin/lrelease|lrelease|g' translate_generation.sh
 
   # 构建
   VERSION=$(head -1 debian/changelog | awk -F'[()]' '{print $2}')

loong64/linglong.yaml

@@ -7,7 +7,7 @@ version: "1"
 package:
   id: org.deepin.reader
   name: "deepin-reader"
-  version: 6.5.12.1
+  version: 6.5.13.1
   kind: app
   description: |
     reader for deepin os.

reader/document/Model.cpp

@@ -70,7 +70,7 @@ deepin_reader::Document *deepin_reader::DocumentFactory::getDocument(const int &
         qDebug() << "正在解压文档..." << targetDoc;
         QString unzipCommand = "unzip " + targetDoc;
         qDebug() << "执行命令: " << unzipCommand;
-        decompressor.start(unzipCommand);
+        decompressor.startCommand(unzipCommand);
         if (!decompressor.waitForStarted()) {
             qInfo() << "start unzip failed";
             error = deepin_reader::Document::ConvertFailed;
@@ -111,7 +111,7 @@ deepin_reader::Document *deepin_reader::DocumentFactory::getDocument(const int &
         QString pandocCommand = QString("pandoc %1 --data-dir=%2 -o %3").arg(targetDoc).arg(pandocDataDir).arg(tmpHtmlFilePath);
 
         qDebug() << "执行命令: " << pandocCommand;
-        converter.start(pandocCommand);
+        converter.startCommand(pandocCommand);
         if (!converter.waitForStarted()) {
             qInfo() << "start pandoc failed";
             error = deepin_reader::Document::ConvertFailed;
@@ -144,7 +144,7 @@ deepin_reader::Document *deepin_reader::DocumentFactory::getDocument(const int &
 
         QString htmltopdfCommand = prefix + "/lib/deepin-reader/htmltopdf " +  tmpHtmlFilePath + " " + realFilePath;
         qDebug() << "执行命令: " << htmltopdfCommand;
-        converter2.start(htmltopdfCommand);
+        converter2.startCommand(htmltopdfCommand);
         if (!converter2.waitForStarted()) {
             qInfo() << "start htmltopdf failed";
             error = deepin_reader::Document::ConvertFailed;