From 8f8a06999cf081d9a1f5d7a96d256d7aaf21200d Mon Sep 17 00:00:00 2001 From: pengfeixx <63588879+pengfeixx@users.noreply.github.com> Date: Sat, 14 Dec 2024 14:32:50 +0800 Subject: [PATCH 1/2] chore: update changelog (#335) update changelog Log: update changelog --- arm64/linglong.yaml | 2 +- debian/changelog | 6 ++++++ linglong.yaml | 2 +- loong64/linglong.yaml | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/arm64/linglong.yaml b/arm64/linglong.yaml index 46eb597f..25ad87fd 100644 --- a/arm64/linglong.yaml +++ b/arm64/linglong.yaml @@ -7,7 +7,7 @@ version: "1" package: id: org.deepin.camera name: "deepin-camera" - version: 6.5.7.1 + version: 6.5.8.1 kind: app description: | camera for deepin os. diff --git a/debian/changelog b/debian/changelog index dcf70aec..3afaf95c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +deepin-camera (6.5.8) unstable; urgency=medium + + * Update version to 6.5.8 + + -- xiepengfei Sat, 14 Dec 2024 14:25:26 +0800 + deepin-camera (6.5.7) unstable; urgency=medium * Update version to 6.5.7 diff --git a/linglong.yaml b/linglong.yaml index b5bd8cb1..108c4153 100644 --- a/linglong.yaml +++ b/linglong.yaml @@ -7,7 +7,7 @@ version: "1" package: id: org.deepin.camera name: "deepin-camera" - version: 6.5.7.1 + version: 6.5.8.1 kind: app description: | camera for deepin os. diff --git a/loong64/linglong.yaml b/loong64/linglong.yaml index 814a1d77..39774b71 100755 --- a/loong64/linglong.yaml +++ b/loong64/linglong.yaml @@ -7,7 +7,7 @@ version: "1" package: id: org.deepin.camera name: "deepin-camera" - version: 6.5.7.1 + version: 6.5.8.1 kind: app description: | camera for deepin os. From c5be40534c3689c4dc9250dc33c64dc517e8e7a7 Mon Sep 17 00:00:00 2001 From: rong wang Date: Wed, 18 Dec 2024 14:59:07 +0800 Subject: [PATCH 2/2] fix: fix fail to view video in linglong env In linglong environment, the application cannot be opened through QProcess, but can be opened through DBus. Log: fix fail to view video in linglong env. Bug: https://pms.uniontech.com/bug-view-282515.html --- src/src/imageitem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src/imageitem.cpp b/src/src/imageitem.cpp index 57f4fae1..0d2ee171 100644 --- a/src/src/imageitem.cpp +++ b/src/src/imageitem.cpp @@ -350,7 +350,7 @@ void ImageItem::openFile() } } else { //用影院打开 -#if 1 +#if 0 program = "ll-cli"; arguments << "run" << "org.deepin.movie"