From 6d0b7726a6c8c0122abe675e9f529c023ca55dea Mon Sep 17 00:00:00 2001 From: wangrong Date: Thu, 29 Jan 2026 21:29:10 +0800 Subject: [PATCH 1/2] fix: Fix build fail for invalid compiler flags As title. Log: Fix build fail for invalid compiler flags --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f550128b..b0a653c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,8 +19,9 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release") set(CMAKE_VERBOSE_MAKEFILE ON) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=${CMAKE_SOURCE_DIR}=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -fcf-protection") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=${CMAKE_SOURCE_DIR}=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -fcf-protection") + set(HARDENING_FLAGS "-Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=${CMAKE_SOURCE_DIR}=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HARDENING_FLAGS}") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HARDENING_FLAGS}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro -Wl,-z,now") endif() From 2418a13adbd495eb7a06b7a6081ec5f1320f6806 Mon Sep 17 00:00:00 2001 From: wangrong Date: Thu, 29 Jan 2026 21:35:03 +0800 Subject: [PATCH 2/2] chore: Bump version to 6.5.36 As title. Log: Bump version to 6.5.36 --- arm64/linglong.yaml | 2 +- debian/changelog | 7 +++++++ linglong.yaml | 2 +- loong64/linglong.yaml | 2 +- sw64/linglong.yaml | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/arm64/linglong.yaml b/arm64/linglong.yaml index 101f9b93..66fe1fe3 100644 --- a/arm64/linglong.yaml +++ b/arm64/linglong.yaml @@ -7,7 +7,7 @@ version: '1' package: id: org.deepin.draw name: deepin-draw - version: 6.5.35.1 + version: 6.5.36.1 kind: app description: | Draw for deepin os. diff --git a/debian/changelog b/debian/changelog index e172e37c..968f153f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +deepin-draw (6.5.36) unstable; urgency=medium + + * build(debian): separate Qt5/Qt6 build configurations for V25/V20 support + * fix: Fix build fail for invalid compiler flags + + -- wangrong Thu, 29 Jan 2026 21:29:58 +0800 + deepin-draw (6.5.35) unstable; urgency=medium * chore: Update compiler flags for security enhancements diff --git a/linglong.yaml b/linglong.yaml index cf9a3add..9700ecbe 100644 --- a/linglong.yaml +++ b/linglong.yaml @@ -7,7 +7,7 @@ version: '1' package: id: org.deepin.draw name: deepin-draw - version: 6.5.35.1 + version: 6.5.36.1 kind: app description: | Draw for deepin os. diff --git a/loong64/linglong.yaml b/loong64/linglong.yaml index 168e21e4..8e21fc70 100755 --- a/loong64/linglong.yaml +++ b/loong64/linglong.yaml @@ -7,7 +7,7 @@ version: '1' package: id: org.deepin.draw name: deepin-draw - version: 6.5.35.1 + version: 6.5.36.1 kind: app description: | Draw for deepin os. diff --git a/sw64/linglong.yaml b/sw64/linglong.yaml index ac677e2c..80ce7816 100755 --- a/sw64/linglong.yaml +++ b/sw64/linglong.yaml @@ -7,7 +7,7 @@ version: '1' package: id: org.deepin.draw name: deepin-draw - version: 6.5.35.1 + version: 6.5.36.1 kind: app description: | Draw for deepin os.