From e7f960e6b98ab6b77f734699779d9d37a1dd8108 Mon Sep 17 00:00:00 2001
From: lzwind <100665065+lzwind@users.noreply.github.com>
Date: Fri, 15 Nov 2024 14:14:30 +0800
Subject: [PATCH 1/2] chore: update version (#153)

update version

Log: update version
---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 90f172fc..19321925 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+image-editor (1.0.47) unstable; urgency=medium
+
+  * remove freeimage
+
+ -- Liu zheng <liuzheng@uniontech.com>  Fri, 15 Nov 2024 14:00:19 +0800
+
 image-editor (1.0.46) unstable; urgency=medium
 
   * chore(CI): add debian check workflow

From e07f21971c693d742e9f516c95f95b940548cd5c Mon Sep 17 00:00:00 2001
From: Hillwood Yang <hillwood@opensuse.org>
Date: Tue, 19 Nov 2024 20:50:28 +0800
Subject: [PATCH 2/2] fix: Use common method to check the version of dtkwidget

Log: Using a special method is not friendly for other distributions
---
 libimageviewer/CMakeLists.txt | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/libimageviewer/CMakeLists.txt b/libimageviewer/CMakeLists.txt
index aee43c77..99f5c84c 100644
--- a/libimageviewer/CMakeLists.txt
+++ b/libimageviewer/CMakeLists.txt
@@ -1,22 +1,17 @@
-#定义需要的cmake版本
+# Define the required cmake version
 cmake_minimum_required(VERSION 3.10)
 
-# 设置工程名字
+# Set project name
 project(libimageviewer VERSION 0.1.0)
 
-# 检查dtkwidget版本
-execute_process(COMMAND dpkg -s libdtkwidget-dev
-                COMMAND grep Version
-                TIMEOUT 5
-                OUTPUT_VARIABLE DWIDGET_VERSION_STR)
-string(REPLACE "Version: " "" DWIDGET_VERSION_STR ${DWIDGET_VERSION_STR})
-message(STATUS "BUILD DTKWidget VERSION ${DWIDGET_VERSION_STR}")
+# Check dtkwidget version
+find_package(DtkWidget REQUIRED)
 
-if (${DWIDGET_VERSION_STR} VERSION_LESS "5.6.9-1")
-    message(STATUS "Use specific dtk watermakr, Version < 5.6.9-1")
+if (${DtkWidget_VERSION} VERSION_LESS "5.6.9")
+    message(STATUS "Use specific dtk watermakr, Version < 5.6.9")
     add_definitions(-DUSE_SPECIFIC_DTK_WATERMARK)
 else()
-    message(STATUS "Use master dtk watermakr, Version >= 5.6.9-1")
+    message(STATUS "Use master dtk watermakr, Version >= 5.6.9")
 endif()
 
 set(CMAKE_CXX_STANDARD 14)