Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix bug #93

Merged
merged 2 commits into from
Dec 6, 2024
Merged

fix bug #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7df89e5
fix: adjust version detection logic for V20/V23 compilation
Johnson-zs Dec 5, 2024
8032226
chore: update version to 5.0.21
Johnson-zs Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions common.pri
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,15 @@ isEmpty(RESOURCE_PATH) {

isEmpty(COMPILE_ON_V23) {
OS_VERSION_FILE = /etc/os-version
COMPILE_ON_V23 = false
COMPILE_ON_V23 = true
!exists($$OS_VERSION_FILE): error(\"$$OS_VERSION_FILE\" is not exists. Install \"deepin-desktop-base\" first)
infile($$OS_VERSION_FILE, MajorVersion, 23) {
COMPILE_ON_V23 = true

# 如果是V20，则设置COMPILE_ON_V23为false
infile($$OS_VERSION_FILE, MajorVersion, 20) {
COMPILE_ON_V23 = false
message("COMPILE ON V20")
} else {
DEFINES += COMPILE_ON_V23
message("COMPILE ON V23")
message("COMPILE ON V23 OR LATER")
}
}
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
deepin-screensaver (5.0.21) unstable; urgency=medium

* fix a bug that os_version error

-- Zhang Sheng <[email protected]> Thu, 05 Dec 2024 19:20:57 +0800

deepin-screensaver (5.0.20) unstable; urgency=medium

* update version to 5.0.20.
Expand Down
Loading