diff --git a/debian/changelog b/debian/changelog index e9e9549..2e8b33f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ calamares (3.3.14-0ubuntu21) resolute; urgency=medium * Fix icon corruption on the "Users" page (LP: #2139358) * Fix initial population of bootloader installation path (LP: #2124977) * Allow ignoring software db update failure (LP: #2143847) + * Fix autopkgtests (LP: #2143232) + - Force the use of Boost.Python's 3.14 library + - Ensure "/tmp/etc" exists before running the SDDM configuration test -- Aaron Rainbolt Tue, 10 Mar 2026 12:32:11 -0400 diff --git a/debian/patches/sddm-test-fix.patch b/debian/patches/sddm-test-fix.patch new file mode 100644 index 0000000..ffca604 --- /dev/null +++ b/debian/patches/sddm-test-fix.patch @@ -0,0 +1,18 @@ +--- a/src/modules/displaymanager/tests/test-dm-sddm.py ++++ b/src/modules/displaymanager/tests/test-dm-sddm.py +@@ -3,6 +3,7 @@ + # + # Calamares Boilerplate + import libcalamares ++import os + libcalamares.globalstorage = libcalamares.GlobalStorage(None) + libcalamares.globalstorage.insert("testing", True) + +@@ -12,6 +13,7 @@ default_desktop_environment = main.Deskt + + # Specific DM test + d = main.DMsddm("/tmp") ++os.makedirs("/tmp/etc", exist_ok=True) + d.set_autologin("d", True, default_desktop_environment) + # .. and again (this time checks load/save) + d.set_autologin("d", True, default_desktop_environment) diff --git a/debian/patches/series b/debian/patches/series index a76eae8..e58ead3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ fix-checkbox-warning-confusion.patch repair-icon-size.patch populate-bootloader-installation-path.patch allow-ignore-software-db-update-failure.patch +sddm-test-fix.patch diff --git a/debian/rules b/debian/rules index 878993e..0293eb6 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ endif dh $@ override_dh_auto_configure: - dh_auto_configure -- -DWITH_PYBIND11=OFF -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DBUILD_APPDATA=ON -DBUILD_APPSTREAM=ON -DINSTALL_COMPLETION=ON -DWITH_QT6=ON + dh_auto_configure -- -DWITH_PYBIND11=OFF -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DBUILD_APPDATA=ON -DBUILD_APPSTREAM=ON -DINSTALL_COMPLETION=ON -DWITH_QT6=ON -DBoost_PYTHON_VERSION=3.14 # Needs to be looked into further override_dh_auto_test: diff --git a/debian/tests/main b/debian/tests/main index e25dfa8..b4d9c43 100755 --- a/debian/tests/main +++ b/debian/tests/main @@ -2,6 +2,6 @@ set -ex mkdir build && cd build && -cmake .. -DWITH_PYBIND11=OFF -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DBUILD_APPDATA=ON -DBUILD_APPSTREAM=ON -DINSTALL_COMPLETION=ON -DWITH_QT6=ON -DBUILD_TESTING=ON -DBUILD_SCHEMA_TESTING=ON && +cmake .. -DWITH_PYBIND11=OFF -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DBUILD_APPDATA=ON -DBUILD_APPSTREAM=ON -DINSTALL_COMPLETION=ON -DWITH_QT6=ON -DBUILD_TESTING=ON -DBUILD_SCHEMA_TESTING=ON -DBoost_PYTHON_VERSION=3.14 && make -j$(nproc) && ctest -j$(nproc) -V -E '^(test_libcalamaresuipaste|validate-unpackfsc|validate-unpackfsc-unpackfsc|validate-unpackfsc-1|partitioncreatelayoutstest|userstest|hostinfotest)$'