Skip to content

fix: remove DTK version mapping for unified build #720

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

Merged
18202781743 merged 1 commit into from
Jan 21, 2026
Merged

fix: remove DTK version mapping for unified build #720

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 0 additions & 13 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ DEB_CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_BUILD_RPATH=ON
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)

# 版本映射：x.y.z -> 5.y.z 和 6.y.z
DTK5_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed -E 's/^[0-9]+(\.|[^0-9]|$$)/5\1/')
DTK6_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed -E 's/^[0-9]+(\.|[^0-9]|$$)/6\1/')
DTK5_MAJOR_MINOR := $(shell echo $(DTK5_VERSION) | cut -d '.' -f 1,2)

# Build-Profiles 控制
BUILD_DOCS := $(if $(filter nodoc,$(DEB_BUILD_PROFILES)),OFF,ON)
BUILD_DTK5 := $(if $(filter nodtk5,$(DEB_BUILD_PROFILES)),OFF,ON)
Expand Down Expand Up @@ -73,14 +68,6 @@ ifeq ($(BUILD_DTK6),ON)
dh_auto_test --builddirectory=build6
endif

override_dh_makeshlibs:
ifeq ($(BUILD_DTK5),ON)
dh_makeshlibs -V "libdtkwidget5 (>= $(DTK5_MAJOR_MINOR))" -plibdtkwidget5
endif
ifeq ($(BUILD_DTK6),ON)
dh_makeshlibs -V "libdtk6widget (>= $(DTK6_VERSION))" -plibdtk6widget
endif

override_dh_auto_clean:
dh_auto_clean --builddirectory=build5
dh_auto_clean --builddirectory=build6
Expand Down
Loading