Lubuntu/calamares-packaging
4
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-qt-code/ubuntu/+source/calamares/+git/calamares synced 2026-03-13 02:37:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Boost.Python 3.14 to avoid a mismatch

Browse Source
This commit is contained in:
Aaron Rainbolt 2026-03-11 13:18:51 -04:00
parent 4be904bb52
commit b4b9469b45
Signed by untrusted user who does not match committer: arraybolt3
GPG Key ID: 39ADDC9EE23AEB08
5 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -3,6 +3,9 @@ calamares (3.3.14-0ubuntu21) resolute; urgency=medium
* Fix icon corruption on the "Users" page (LP: #2139358) * Fix icon corruption on the "Users" page (LP: #2139358)
* Fix initial population of bootloader installation path (LP: #2124977) * Fix initial population of bootloader installation path (LP: #2124977)
* Allow ignoring software db update failure (LP: #2143847) * 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 <arraybolt3@ubuntu.com> Tue, 10 Mar 2026 12:32:11 -0400 -- Aaron Rainbolt <arraybolt3@ubuntu.com> Tue, 10 Mar 2026 12:32:11 -0400

18
debian/patches/sddm-test-fix.patch vendored Normal file
View File

@ -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)

1
debian/patches/series vendored
View File

@ -7,3 +7,4 @@ fix-checkbox-warning-confusion.patch
repair-icon-size.patch repair-icon-size.patch
populate-bootloader-installation-path.patch populate-bootloader-installation-path.patch
allow-ignore-software-db-update-failure.patch allow-ignore-software-db-update-failure.patch
sddm-test-fix.patch

2
debian/rules vendored
View File

@ -12,7 +12,7 @@ endif
dh $@ dh $@
override_dh_auto_configure: 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 # Needs to be looked into further
override_dh_auto_test: override_dh_auto_test:

2
debian/tests/main vendored
View File

@ -2,6 +2,6 @@
set -ex set -ex
mkdir build && cd build && 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) && make -j$(nproc) &&
ctest -j$(nproc) -V -E '^(test_libcalamaresuipaste|validate-unpackfsc|validate-unpackfsc-unpackfsc|validate-unpackfsc-1|partitioncreatelayoutstest|userstest|hostinfotest)$' ctest -j$(nproc) -V -E '^(test_libcalamaresuipaste|validate-unpackfsc|validate-unpackfsc-unpackfsc|validate-unpackfsc-1|partitioncreatelayoutstest|userstest|hostinfotest)$'