From 041c1f781619a11c256bc972c66a3fc0ba2e14a6 Mon Sep 17 00:00:00 2001 From: dengzhongyuan Date: Thu, 19 Jun 2025 19:43:01 +0800 Subject: [PATCH 1/2] chore: Comment out tests subdirectory in src.pro - Commented out the SUBDIRS entry for tests in src.pro to exclude it from the build process. - Updated security compilation flags in tests.pro to use -fPIE instead of -fPIC for better compatibility. Log: Adjust project structure and enhance security compilation settings. --- src/src.pro | 6 +++++- src/tests/tests.pro | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/src.pro b/src/src.pro index 3db67142..83bfec18 100644 --- a/src/src.pro +++ b/src/src.pro @@ -10,7 +10,11 @@ linux { } SUBDIRS += app -SUBDIRS += tests + + +#SUBDIRS += tests + + mac* { TRANSLATIONS_NAME = deepin-boot-maker TRANSLATIONS += $$PWD/translations/$${TRANSLATIONS_NAME}.ts \ diff --git a/src/tests/tests.pro b/src/tests/tests.pro index a27725bc..99599c5c 100644 --- a/src/tests/tests.pro +++ b/src/tests/tests.pro @@ -9,8 +9,8 @@ CONFIG(debug, debug|release) { #添加安全编译参数 QMAKE_LFLAGS += -z noexecstack -pie -z relro -z now -QMAKE_CFLAGS += -fstack-protector-all -fPIC -QMAKE_CXXFLAGS += -fstack-protector-all -fno-access-control -fPIC +QMAKE_CFLAGS += -fstack-protector-all -fPIE +QMAKE_CXXFLAGS += -fstack-protector-all -fno-access-control -fPIE QT += core gui widgets testlib From 68f1640b72221c3d1eb6156c7868139beb5a2d71 Mon Sep 17 00:00:00 2001 From: dengzhongyuan Date: Thu, 19 Jun 2025 19:46:28 +0800 Subject: [PATCH 2/2] chore(version): bump debian version to 6.0.6 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 26718d62..c69387d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +deepin-boot-maker (6.0.6) unstable; urgency=medium + + * chore: Comment out tests subdirectory in src.pro + + -- dengzhongyuan Thu, 19 Jun 2025 19:46:23 +0800 + deepin-boot-maker (6.0.5) unstable; urgency=medium * chore: Update compiler flags for security enhancements